diff --git a/cod_base/cod_base.features.inc b/cod_base/cod_base.features.inc
index e53c5eb..89afbfb 100644
--- a/cod_base/cod_base.features.inc
+++ b/cod_base/cod_base.features.inc
@@ -13,13 +13,3 @@ function cod_base_ctools_plugin_api() {
     return array("version" => "1");
   }
 }
-
-/**
- * Implements hook_date_format_types().
- */
-function cod_base_date_format_types() {
-  $format_types = array();
-  // Exported date format type: date_no_time_
-  $format_types['date_no_time_'] = 'Date (no time)';
-  return $format_types;
-}
diff --git a/cod_base/cod_base.features.user_permission.inc b/cod_base/cod_base.features.user_permission.inc
index c57d5c3..a6891c1 100755
--- a/cod_base/cod_base.features.user_permission.inc
+++ b/cod_base/cod_base.features.user_permission.inc
@@ -14,8 +14,8 @@ function cod_base_user_default_permissions() {
   $permissions['access administration menu'] = array(
     'name' => 'access administration menu',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'admin_menu',
   );
@@ -24,8 +24,8 @@ function cod_base_user_default_permissions() {
   $permissions['access administration pages'] = array(
     'name' => 'access administration pages',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'system',
   );
@@ -34,8 +34,8 @@ function cod_base_user_default_permissions() {
   $permissions['access content'] = array(
     'name' => 'access content',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -44,8 +44,8 @@ function cod_base_user_default_permissions() {
   $permissions['access content overview'] = array(
     'name' => 'access content overview',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'node',
   );
@@ -54,7 +54,7 @@ function cod_base_user_default_permissions() {
   $permissions['access dashboard'] = array(
     'name' => 'access dashboard',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'dashboard',
   );
@@ -63,8 +63,8 @@ function cod_base_user_default_permissions() {
   $permissions['access private fields'] = array(
     'name' => 'access private fields',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'field_permissions',
   );
@@ -73,8 +73,8 @@ function cod_base_user_default_permissions() {
   $permissions['access site in maintenance mode'] = array(
     'name' => 'access site in maintenance mode',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'system',
   );
@@ -83,7 +83,7 @@ function cod_base_user_default_permissions() {
   $permissions['access site reports'] = array(
     'name' => 'access site reports',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'system',
   );
@@ -92,8 +92,8 @@ function cod_base_user_default_permissions() {
   $permissions['access user profiles'] = array(
     'name' => 'access user profiles',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'user',
   );
@@ -102,8 +102,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer comments'] = array(
     'name' => 'administer comments',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'comment',
   );
@@ -112,7 +112,7 @@ function cod_base_user_default_permissions() {
   $permissions['administer content types'] = array(
     'name' => 'administer content types',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'node',
   );
@@ -121,8 +121,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer field permissions'] = array(
     'name' => 'administer field permissions',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'field_permissions',
   );
@@ -131,8 +131,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer menu'] = array(
     'name' => 'administer menu',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'menu',
   );
@@ -141,8 +141,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer nodes'] = array(
     'name' => 'administer nodes',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'node',
   );
@@ -151,8 +151,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer pathauto'] = array(
     'name' => 'administer pathauto',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'pathauto',
   );
@@ -161,7 +161,7 @@ function cod_base_user_default_permissions() {
   $permissions['administer permissions'] = array(
     'name' => 'administer permissions',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'user',
   );
@@ -170,7 +170,7 @@ function cod_base_user_default_permissions() {
   $permissions['administer site configuration'] = array(
     'name' => 'administer site configuration',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'system',
   );
@@ -179,8 +179,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer taxonomy'] = array(
     'name' => 'administer taxonomy',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'taxonomy',
   );
@@ -189,8 +189,8 @@ function cod_base_user_default_permissions() {
   $permissions['administer url aliases'] = array(
     'name' => 'administer url aliases',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'path',
   );
@@ -199,7 +199,7 @@ function cod_base_user_default_permissions() {
   $permissions['administer users'] = array(
     'name' => 'administer users',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'user',
   );
@@ -208,7 +208,7 @@ function cod_base_user_default_permissions() {
   $permissions['administer views'] = array(
     'name' => 'administer views',
     'roles' => array(
-      0 => 'administrator',
+      'administrator' => 'administrator',
     ),
     'module' => 'views',
   );
@@ -217,8 +217,8 @@ function cod_base_user_default_permissions() {
   $permissions['bypass node access'] = array(
     'name' => 'bypass node access',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'node',
   );
@@ -227,8 +227,8 @@ function cod_base_user_default_permissions() {
   $permissions['create url aliases'] = array(
     'name' => 'create url aliases',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'path',
   );
@@ -237,8 +237,8 @@ function cod_base_user_default_permissions() {
   $permissions['flush caches'] = array(
     'name' => 'flush caches',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'admin_menu',
   );
@@ -247,8 +247,8 @@ function cod_base_user_default_permissions() {
   $permissions['notify of path changes'] = array(
     'name' => 'notify of path changes',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'pathauto',
   );
@@ -257,8 +257,8 @@ function cod_base_user_default_permissions() {
   $permissions['view advanced help index'] = array(
     'name' => 'view advanced help index',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'advanced_help',
   );
@@ -267,8 +267,8 @@ function cod_base_user_default_permissions() {
   $permissions['view advanced help popup'] = array(
     'name' => 'view advanced help popup',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'advanced_help',
   );
@@ -277,8 +277,8 @@ function cod_base_user_default_permissions() {
   $permissions['view advanced help topic'] = array(
     'name' => 'view advanced help topic',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'advanced_help',
   );
@@ -287,8 +287,8 @@ function cod_base_user_default_permissions() {
   $permissions['view the administration theme'] = array(
     'name' => 'view the administration theme',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
+      'administrator' => 'administrator',
+      'content editor' => 'content editor',
     ),
     'module' => 'system',
   );
diff --git a/cod_base/cod_base.info b/cod_base/cod_base.info
index 75be644..376bfbc 100755
--- a/cod_base/cod_base.info
+++ b/cod_base/cod_base.info
@@ -17,7 +17,6 @@ dependencies[] = taxonomy
 dependencies[] = token
 dependencies[] = views
 features[ctools][] = strongarm:strongarm:1
-features[date_format_types][] = date_no_time_
 features[features_api][] = api:1
 features[field][] = user-user-field_profile_first
 features[field][] = user-user-field_profile_interests
@@ -57,4 +56,4 @@ features[user_role][] = administrator
 features[user_role][] = content editor
 features[variable][] = admin_toolbar
 features[variable][] = date_format_date_no_time_
-files[] = cod_base.module
\ No newline at end of file
+files[] = cod_base.module
diff --git a/cod_base/cod_base.strongarm.inc b/cod_base/cod_base.strongarm.inc
index c0bbb7c..b95eedf 100644
--- a/cod_base/cod_base.strongarm.inc
+++ b/cod_base/cod_base.strongarm.inc
@@ -31,7 +31,7 @@ function cod_base_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'date_format_date_no_time_';
-  $strongarm->value = 'D, j M Y';
+  $strongarm->value = 'm/d/Y - H:i';
   $export['date_format_date_no_time_'] = $strongarm;
 
   return $export;
diff --git a/cod_bof/cod_bof.features.field.inc b/cod_bof/cod_bof.features.field.inc
old mode 100755
new mode 100644
index 23d6ab8..eaf9e7b
--- a/cod_bof/cod_bof.features.field.inc
+++ b/cod_bof/cod_bof.features.field.inc
@@ -197,9 +197,116 @@ function cod_bof_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-bof_session-og_group_ref'.
+  $fields['node-bof_session-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'bof_session',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 4,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 5,
+      ),
+    ),
+  );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Description');
+  t('Groups audience');
   t('Session Time Slot(s)');
 
   return $fields;
diff --git a/cod_bof/cod_bof.features.inc b/cod_bof/cod_bof.features.inc
old mode 100755
new mode 100644
index fa25e55..413c28a
--- a/cod_bof/cod_bof.features.inc
+++ b/cod_bof/cod_bof.features.inc
@@ -22,7 +22,7 @@ function cod_bof_ctools_plugin_api() {
  * Implements hook_views_api().
  */
 function cod_bof_views_api() {
-  return array("version" => "3.0");
+  return array("api" => "3.0");
 }
 
 /**
diff --git a/cod_bof/cod_bof.features.user_permission.inc b/cod_bof/cod_bof.features.user_permission.inc
index 5f0948f..1f7e919 100644
--- a/cod_bof/cod_bof.features.user_permission.inc
+++ b/cod_bof/cod_bof.features.user_permission.inc
@@ -14,7 +14,7 @@ function cod_bof_user_default_permissions() {
   $permissions['create bof_session content'] = array(
     'name' => 'create bof_session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -30,7 +30,7 @@ function cod_bof_user_default_permissions() {
   $permissions['delete own bof_session content'] = array(
     'name' => 'delete own bof_session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -46,7 +46,7 @@ function cod_bof_user_default_permissions() {
   $permissions['edit own bof_session content'] = array(
     'name' => 'edit own bof_session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
diff --git a/cod_bof/cod_bof.info b/cod_bof/cod_bof.info
old mode 100755
new mode 100644
index 61ef73c..96ff648
--- a/cod_bof/cod_bof.info
+++ b/cod_bof/cod_bof.info
@@ -1,15 +1,23 @@
 name = COD BoF Session
-description = BoFs are self-scheduled, unconference style sessions
+description = BoFs are self-scheduled, unconference style sessions. Multi events functionality through Organic Groups. 
 core = 7.x
 package = COD
 php = 5.2.4
+version = 7.x-2.0
+dependencies[] = cod_events
 dependencies[] = cod_session
 dependencies[] = commons_wysiwyg
+dependencies[] = ctools
 dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = field_group
+dependencies[] = node
+dependencies[] = og
+dependencies[] = og_ui
 dependencies[] = options
+dependencies[] = quicktabs
 dependencies[] = strongarm
+dependencies[] = text
 dependencies[] = views
 dependencies[] = views_field_view
 features[ctools][] = field_group:field_group:1
@@ -18,6 +26,7 @@ features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
 features[field][] = node-bof_session-body
 features[field][] = node-bof_session-field_session_timeslot
+features[field][] = node-bof_session-og_group_ref
 features[field_group][] = group_bof_schedule|node|bof_session|form
 features[node][] = bof_session
 features[user_permission][] = create bof_session content
diff --git a/cod_bof/cod_bof.module b/cod_bof/cod_bof.module
old mode 100755
new mode 100644
diff --git a/cod_bof/cod_bof.strongarm.inc b/cod_bof/cod_bof.strongarm.inc
old mode 100755
new mode 100644
diff --git a/cod_bof/cod_bof.views_default.inc b/cod_bof/cod_bof.views_default.inc
old mode 100755
new mode 100644
diff --git a/cod_events/cod_events.features.field.inc b/cod_events/cod_events.features.field.inc
index 4f5c230..9c08bb1 100644
--- a/cod_events/cod_events.features.field.inc
+++ b/cod_events/cod_events.features.field.inc
@@ -108,6 +108,9 @@ function cod_events_field_default_fields() {
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_dates',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
       'foreign keys' => array(),
       'indexes' => array(),
       'locked' => '0',
@@ -197,6 +200,9 @@ function cod_events_field_default_fields() {
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_image_cache',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
       'foreign keys' => array(
         'fid' => array(
           'columns' => array(
@@ -371,10 +377,102 @@ function cod_events_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-event-group_group'.
+  $fields['node-event-group_group'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'group_group',
+      'foreign keys' => array(),
+      'indexes' => array(
+        'value' => array(
+          0 => 'value',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'list',
+      'settings' => array(
+        'allowed_values' => array(
+          0 => 'Not a group',
+          1 => 'Group',
+        ),
+        'allowed_values_function' => '',
+      ),
+      'translatable' => '0',
+      'type' => 'list_boolean',
+    ),
+    'field_instance' => array(
+      'bundle' => 'event',
+      'default_value' => array(
+        0 => array(
+          'value' => 1,
+        ),
+      ),
+      'deleted' => '0',
+      'description' => 'Determine if this is an OG group.',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(
+            'field_name' => FALSE,
+          ),
+          'type' => 'og_group_subscribe',
+          'weight' => 7,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'display_label' => 1,
+      'entity_type' => 'node',
+      'field_name' => 'group_group',
+      'label' => 'Group',
+      'required' => FALSE,
+      'settings' => array(
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_group_subscribe',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_group_subscribe',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'options',
+        'settings' => array(
+          'display_label' => 0,
+          'og_hide' => TRUE,
+        ),
+        'type' => 'options_onoff',
+        'weight' => 0,
+      ),
+    ),
+  );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Body');
   t('Dates');
+  t('Determine if this is an OG group.');
+  t('Group');
   t('If this is a free event, then you can choose which registration type to use for this event.');
   t('Image');
   t('Registration');
diff --git a/cod_events/cod_events.features.inc b/cod_events/cod_events.features.inc
index 643f86d..c35bb7d 100644
--- a/cod_events/cod_events.features.inc
+++ b/cod_events/cod_events.features.inc
@@ -15,6 +15,13 @@ function cod_events_ctools_plugin_api() {
 }
 
 /**
+ * Implements hook_views_api().
+ */
+function cod_events_views_api() {
+  return array("api" => "3.0");
+}
+
+/**
  * Implements hook_node_info().
  */
 function cod_events_node_info() {
@@ -41,7 +48,8 @@ function cod_events_default_registration_type() {
     "label" : "Free Event",
     "locked" : "0",
     "weight" : "0",
-    "data" : null
+    "data" : null,
+    "rdf_mapping" : []
   }');
   return $items;
 }
diff --git a/cod_events/cod_events.features.user_permission.inc b/cod_events/cod_events.features.user_permission.inc
index 7ba8438..a4a48ff 100644
--- a/cod_events/cod_events.features.user_permission.inc
+++ b/cod_events/cod_events.features.user_permission.inc
@@ -21,8 +21,8 @@ function cod_events_user_default_permissions() {
   $permissions['create free_event registration'] = array(
     'name' => 'create free_event registration',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'registration',
   );
@@ -31,8 +31,8 @@ function cod_events_user_default_permissions() {
   $permissions['create free_event registration other anonymous'] = array(
     'name' => 'create free_event registration other anonymous',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'registration',
   );
@@ -48,7 +48,7 @@ function cod_events_user_default_permissions() {
   $permissions['delete any free_event registration'] = array(
     'name' => 'delete any free_event registration',
     'roles' => array(
-      0 => 'attendee manager',
+      'attendee manager' => 'attendee manager',
     ),
     'module' => 'registration',
   );
@@ -57,7 +57,7 @@ function cod_events_user_default_permissions() {
   $permissions['delete own free_event registration'] = array(
     'name' => 'delete own free_event registration',
     'roles' => array(
-      0 => 'attendee manager',
+      'attendee manager' => 'attendee manager',
     ),
     'module' => 'registration',
   );
@@ -66,7 +66,7 @@ function cod_events_user_default_permissions() {
   $permissions['update any free_event registration'] = array(
     'name' => 'update any free_event registration',
     'roles' => array(
-      0 => 'attendee manager',
+      'attendee manager' => 'attendee manager',
     ),
     'module' => 'registration',
   );
@@ -75,7 +75,7 @@ function cod_events_user_default_permissions() {
   $permissions['update own free_event registration'] = array(
     'name' => 'update own free_event registration',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'registration',
   );
@@ -84,7 +84,7 @@ function cod_events_user_default_permissions() {
   $permissions['view free_event registration'] = array(
     'name' => 'view free_event registration',
     'roles' => array(
-      0 => 'attendee manager',
+      'attendee manager' => 'attendee manager',
     ),
     'module' => 'registration',
   );
@@ -93,7 +93,7 @@ function cod_events_user_default_permissions() {
   $permissions['view own free_event registration'] = array(
     'name' => 'view own free_event registration',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'registration',
   );
diff --git a/cod_events/cod_events.info b/cod_events/cod_events.info
index 52dd8b3..a8a902e 100644
--- a/cod_events/cod_events.info
+++ b/cod_events/cod_events.info
@@ -1,8 +1,9 @@
 name = COD Events
-description = Provides base event managment
+description = Provides base event management such.  Also includes multiple events functionality through the use of Organic Groups.
 core = 7.x
 package = COD
 php = 5.2.4
+version = 7.x-2.0
 project = cod_events
 dependencies[] = cod_base
 dependencies[] = date
@@ -10,14 +11,20 @@ dependencies[] = date_api
 dependencies[] = date_popup
 dependencies[] = features
 dependencies[] = image
+dependencies[] = list
+dependencies[] = og_ui
 dependencies[] = registration
 dependencies[] = strongarm
+dependencies[] = text
+dependencies[] = views
 features[ctools][] = strongarm:strongarm:1
+features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
 features[field][] = node-event-body
 features[field][] = node-event-field_dates
 features[field][] = node-event-field_image_cache
 features[field][] = node-event-field_registration
+features[field][] = node-event-group_group
 features[node][] = event
 features[registration_type][] = free_event
 features[user_permission][] = administer free_event registration
@@ -44,3 +51,7 @@ features[variable][] = menu_parent_event
 features[variable][] = node_options_event
 features[variable][] = node_preview_event
 features[variable][] = node_submitted_event
+features[views_view][] = events
+features_exclude[dependencies][ctools] = ctools
+features_exclude[dependencies][entity] = entity
+features_exclude[dependencies][options] = options
diff --git a/cod_events/cod_events.views_default.inc b/cod_events/cod_events.views_default.inc
new file mode 100644
index 0000000..29c6c1b
--- /dev/null
+++ b/cod_events/cod_events.views_default.inc
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @file
+ * cod_events.views_default.inc
+ */
+
+/**
+ * Implements hook_views_default_views().
+ */
+function cod_events_views_default_views() {
+  $export = array();
+
+  $view = new view();
+  $view->name = 'events';
+  $view->description = '';
+  $view->tag = 'default';
+  $view->base_table = 'node';
+  $view->human_name = 'Events';
+  $view->core = 7;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Master */
+  $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['title'] = 'Events';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+  $handler->display->display_options['style_plugin'] = 'default';
+  $handler->display->display_options['row_plugin'] = 'node';
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['label'] = '';
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+  /* Sort criterion: Content: Dates (field_dates) */
+  $handler->display->display_options['sorts']['field_dates_value']['id'] = 'field_dates_value';
+  $handler->display->display_options['sorts']['field_dates_value']['table'] = 'field_data_field_dates';
+  $handler->display->display_options['sorts']['field_dates_value']['field'] = 'field_dates_value';
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 1;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['path'] = 'events';
+  $handler->display->display_options['menu']['type'] = 'normal';
+  $handler->display->display_options['menu']['title'] = 'Events';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['menu']['name'] = 'main-menu';
+  $handler->display->display_options['menu']['context'] = 0;
+
+  /* Display: Block */
+  $handler = $view->new_display('block', 'Block', 'block');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'some';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '5';
+  $handler->display->display_options['defaults']['style_plugin'] = FALSE;
+  $handler->display->display_options['style_plugin'] = 'default';
+  $handler->display->display_options['defaults']['style_options'] = FALSE;
+  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+  $handler->display->display_options['row_plugin'] = 'fields';
+  $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $export['events'] = $view;
+
+  return $export;
+}
diff --git a/cod_news/cod_news.features.field.inc b/cod_news/cod_news.features.field.inc
index 5517973..06d3d3e 100644
--- a/cod_news/cod_news.features.field.inc
+++ b/cod_news/cod_news.features.field.inc
@@ -101,9 +101,116 @@ function cod_news_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-news-og_group_ref'.
+  $fields['node-news-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'news',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 1,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 31,
+      ),
+    ),
+  );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Body');
+  t('Groups audience');
 
   return $fields;
 }
diff --git a/cod_news/cod_news.info b/cod_news/cod_news.info
index 869c744..6fe41fd 100644
--- a/cod_news/cod_news.info
+++ b/cod_news/cod_news.info
@@ -1,18 +1,21 @@
 name = COD News
-description = News for a COD site
+description = News for a COD site. Multiple events functionality through the use of Organic Groups.
 core = 7.x
 package = COD
 php = 5.2.4
+version = 7.x-2.0
 project = cod_news
 dependencies[] = comment
 dependencies[] = features
 dependencies[] = menu
+dependencies[] = og_ui
 dependencies[] = strongarm
 dependencies[] = views
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
 features[field][] = node-news-body
+features[field][] = node-news-og_group_ref
 features[node][] = news
 features[variable][] = comment_anonymous_news
 features[variable][] = comment_default_mode_news
@@ -21,5 +24,9 @@ features[variable][] = comment_form_location_news
 features[variable][] = comment_news
 features[variable][] = comment_preview_news
 features[variable][] = comment_subject_field_news
+features[variable][] = menu_options_news
+features[variable][] = menu_parent_news
 features[variable][] = node_options_news
+features[variable][] = node_preview_news
+features[variable][] = node_submitted_news
 features[views_view][] = news
diff --git a/cod_news/cod_news.strongarm.inc b/cod_news/cod_news.strongarm.inc
index 14c6583..660f3b8 100644
--- a/cod_news/cod_news.strongarm.inc
+++ b/cod_news/cod_news.strongarm.inc
@@ -62,6 +62,22 @@ function cod_news_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_news';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_news'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_news';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_news'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'node_options_news';
   $strongarm->value = array(
     0 => 'status',
@@ -69,5 +85,19 @@ function cod_news_strongarm() {
   );
   $export['node_options_news'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_news';
+  $strongarm->value = '1';
+  $export['node_preview_news'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_news';
+  $strongarm->value = 1;
+  $export['node_submitted_news'] = $strongarm;
+
   return $export;
 }
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index eecc0b3..d08a358 100755
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -316,6 +316,112 @@ function cod_session_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-page-og_group_ref'.
+  $fields['node-page-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'page',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 1,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 31,
+      ),
+    ),
+  );
+
   // Exported field: 'node-room-body'.
   $fields['node-room-body'] = array(
     'field_config' => array(
@@ -634,6 +740,112 @@ function cod_session_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-room-og_group_ref'.
+  $fields['node-room-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'room',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 5,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 32,
+      ),
+    ),
+  );
+
   // Exported field: 'node-schedule_item-body'.
   $fields['node-schedule_item-body'] = array(
     'field_config' => array(
@@ -901,6 +1113,112 @@ function cod_session_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-schedule_item-og_group_ref'.
+  $fields['node-schedule_item-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'schedule_item',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 10,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 31,
+      ),
+    ),
+  );
+
   // Exported field: 'node-session-body'.
   $fields['node-session-body'] = array(
     'field_config' => array(
@@ -1513,6 +1831,112 @@ function cod_session_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-session-og_group_ref'.
+  $fields['node-session-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'session',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 13,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 34,
+      ),
+    ),
+  );
+
   // Exported field: 'node-time_slot-field_slot_datetime'.
   $fields['node-time_slot-field_slot_datetime'] = array(
     'field_config' => array(
@@ -1633,6 +2057,112 @@ function cod_session_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-time_slot-og_group_ref'.
+  $fields['node-time_slot-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'time_slot',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 1,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 3,
+      ),
+    ),
+  );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Allowed Schedule Types');
@@ -1641,6 +2171,7 @@ function cod_session_field_default_fields() {
   t('Date and time');
   t('Description');
   t('Experience level');
+  t('Groups audience');
   t('Photo');
   t('Select the relevant time slots this session should appear at.');
   t('Session Time Slot(s)');
diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc
index 16841d6..6c54b9b 100755
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -22,7 +22,7 @@ function cod_session_ctools_plugin_api() {
  * Implements hook_views_api().
  */
 function cod_session_views_api() {
-  return array("version" => "3.0");
+  return array("api" => "3.0");
 }
 
 /**
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index a8c6d7c..1a7fbdd 100755
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -14,7 +14,7 @@ function cod_session_user_default_permissions() {
   $permissions['create field_accepted'] = array(
     'name' => 'create field_accepted',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'field_permissions',
   );
@@ -23,7 +23,7 @@ function cod_session_user_default_permissions() {
   $permissions['create room content'] = array(
     'name' => 'create room content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -32,7 +32,7 @@ function cod_session_user_default_permissions() {
   $permissions['create schedule_item content'] = array(
     'name' => 'create schedule_item content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -41,7 +41,7 @@ function cod_session_user_default_permissions() {
   $permissions['create session content'] = array(
     'name' => 'create session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -50,7 +50,7 @@ function cod_session_user_default_permissions() {
   $permissions['create time_slot content'] = array(
     'name' => 'create time_slot content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -59,7 +59,7 @@ function cod_session_user_default_permissions() {
   $permissions['delete any room content'] = array(
     'name' => 'delete any room content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -68,7 +68,7 @@ function cod_session_user_default_permissions() {
   $permissions['delete any schedule_item content'] = array(
     'name' => 'delete any schedule_item content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -77,7 +77,7 @@ function cod_session_user_default_permissions() {
   $permissions['delete any session content'] = array(
     'name' => 'delete any session content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -86,7 +86,7 @@ function cod_session_user_default_permissions() {
   $permissions['delete any time_slot content'] = array(
     'name' => 'delete any time_slot content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -95,7 +95,7 @@ function cod_session_user_default_permissions() {
   $permissions['delete own session content'] = array(
     'name' => 'delete own session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -104,7 +104,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit any room content'] = array(
     'name' => 'edit any room content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -113,7 +113,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit any schedule_item content'] = array(
     'name' => 'edit any schedule_item content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -122,7 +122,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit any session content'] = array(
     'name' => 'edit any session content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -131,7 +131,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit any time_slot content'] = array(
     'name' => 'edit any time_slot content',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'node',
   );
@@ -140,7 +140,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit field_accepted'] = array(
     'name' => 'edit field_accepted',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'field_permissions',
   );
@@ -149,7 +149,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit own field_accepted'] = array(
     'name' => 'edit own field_accepted',
     'roles' => array(
-      0 => 'session organizer',
+      'session organizer' => 'session organizer',
     ),
     'module' => 'field_permissions',
   );
@@ -158,7 +158,7 @@ function cod_session_user_default_permissions() {
   $permissions['edit own session content'] = array(
     'name' => 'edit own session content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
@@ -167,8 +167,8 @@ function cod_session_user_default_permissions() {
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'field_permissions',
   );
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index 6cb9c27..3fae2d5 100755
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -1,8 +1,9 @@
 name = COD Session
-description = COD Session Scheduling & Voting
+description = COD Session Scheduling & Voting.  Includes multiple events through the use of Organic Groups.
 core = 7.x
 package = COD
 php = 5.2.4
+version = 7.x-2.0
 project = cod_support
 dependencies[] = auto_nodetitle
 dependencies[] = cod_base
@@ -19,6 +20,7 @@ dependencies[] = image
 dependencies[] = list
 dependencies[] = menu
 dependencies[] = number
+dependencies[] = og_ui
 dependencies[] = quicktabs
 dependencies[] = quicktabs_tabstyles
 dependencies[] = search
@@ -36,13 +38,16 @@ features[field][] = field_collection_item-field_room_slots_types_allowed-field_s
 features[field][] = field_collection_item-field_room_slots_types_allowed-field_slot_types_capacity
 features[field][] = field_collection_item-field_room_slots_types_allowed-field_slot_types_time_slot
 features[field][] = node-page-body
+features[field][] = node-page-og_group_ref
 features[field][] = node-room-body
 features[field][] = node-room-field_room_capacity
 features[field][] = node-room-field_room_photo
 features[field][] = node-room-field_room_slots_types_allowed
+features[field][] = node-room-og_group_ref
 features[field][] = node-schedule_item-body
 features[field][] = node-schedule_item-field_accepted
 features[field][] = node-schedule_item-field_session_timeslot
+features[field][] = node-schedule_item-og_group_ref
 features[field][] = node-session-body
 features[field][] = node-session-field_accepted
 features[field][] = node-session-field_experience
@@ -50,7 +55,9 @@ features[field][] = node-session-field_session_timeslot
 features[field][] = node-session-field_slides
 features[field][] = node-session-field_speakers
 features[field][] = node-session-field_track
+features[field][] = node-session-og_group_ref
 features[field][] = node-time_slot-field_slot_datetime
+features[field][] = node-time_slot-og_group_ref
 features[field_group][] = group_audience|node|session|default
 features[field_group][] = group_audience|node|session|form
 features[field_group][] = group_schedule_info|node|schedule_item|default
@@ -89,23 +96,28 @@ features[user_permission][] = view field_accepted
 features[user_role][] = session organizer
 features[variable][] = ant_pattern_time_slot
 features[variable][] = ant_time_slot
+features[variable][] = comment_anonymous_page
 features[variable][] = comment_anonymous_room
 features[variable][] = comment_anonymous_schedule_item
 features[variable][] = comment_anonymous_session
 features[variable][] = comment_anonymous_time_slot
+features[variable][] = comment_default_mode_page
 features[variable][] = comment_default_mode_room
 features[variable][] = comment_default_mode_schedule_item
 features[variable][] = comment_default_mode_session
 features[variable][] = comment_default_mode_time_slot
+features[variable][] = comment_default_per_page_page
 features[variable][] = comment_default_per_page_room
 features[variable][] = comment_default_per_page_schedule_item
 features[variable][] = comment_default_per_page_session
 features[variable][] = comment_default_per_page_time_slot
+features[variable][] = comment_form_location_page
 features[variable][] = comment_form_location_room
 features[variable][] = comment_form_location_schedule_item
 features[variable][] = comment_form_location_session
 features[variable][] = comment_form_location_time_slot
 features[variable][] = comment_page
+features[variable][] = comment_preview_page
 features[variable][] = comment_preview_room
 features[variable][] = comment_preview_schedule_item
 features[variable][] = comment_preview_session
@@ -113,6 +125,7 @@ features[variable][] = comment_preview_time_slot
 features[variable][] = comment_room
 features[variable][] = comment_schedule_item
 features[variable][] = comment_session
+features[variable][] = comment_subject_field_page
 features[variable][] = comment_subject_field_room
 features[variable][] = comment_subject_field_schedule_item
 features[variable][] = comment_subject_field_session
@@ -122,15 +135,30 @@ features[variable][] = field_bundle_settings_node__room
 features[variable][] = field_bundle_settings_node__schedule_item
 features[variable][] = field_bundle_settings_node__session
 features[variable][] = field_bundle_settings_node__time_slot
+features[variable][] = menu_options_page
+features[variable][] = menu_options_room
+features[variable][] = menu_options_schedule_item
+features[variable][] = menu_options_session
 features[variable][] = menu_options_time_slot
+features[variable][] = menu_parent_page
+features[variable][] = menu_parent_room
+features[variable][] = menu_parent_schedule_item
+features[variable][] = menu_parent_session
 features[variable][] = menu_parent_time_slot
 features[variable][] = node_options_page
 features[variable][] = node_options_room
 features[variable][] = node_options_schedule_item
 features[variable][] = node_options_session
 features[variable][] = node_options_time_slot
+features[variable][] = node_preview_page
+features[variable][] = node_preview_room
+features[variable][] = node_preview_schedule_item
+features[variable][] = node_preview_session
 features[variable][] = node_preview_time_slot
 features[variable][] = node_submitted_page
+features[variable][] = node_submitted_room
+features[variable][] = node_submitted_schedule_item
+features[variable][] = node_submitted_session
 features[variable][] = node_submitted_time_slot
 features[views_view][] = cod_schedule
 features[views_view][] = cod_session_schedule
diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc
index e76c946..23ba430 100755
--- a/cod_session/cod_session.strongarm.inc
+++ b/cod_session/cod_session.strongarm.inc
@@ -27,6 +27,13 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_anonymous_page';
+  $strongarm->value = 0;
+  $export['comment_anonymous_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_room';
   $strongarm->value = 0;
   $export['comment_anonymous_room'] = $strongarm;
@@ -55,6 +62,13 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_mode_page';
+  $strongarm->value = 1;
+  $export['comment_default_mode_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_room';
   $strongarm->value = 1;
   $export['comment_default_mode_room'] = $strongarm;
@@ -83,6 +97,13 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_per_page_page';
+  $strongarm->value = '50';
+  $export['comment_default_per_page_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_room';
   $strongarm->value = '50';
   $export['comment_default_per_page_room'] = $strongarm;
@@ -111,6 +132,13 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_form_location_page';
+  $strongarm->value = 1;
+  $export['comment_form_location_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_room';
   $strongarm->value = 1;
   $export['comment_form_location_room'] = $strongarm;
@@ -140,12 +168,19 @@ function cod_session_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_page';
-  $strongarm->value = 'COMMENT_NODE_DISABLED';
+  $strongarm->value = 0;
   $export['comment_page'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_preview_page';
+  $strongarm->value = '1';
+  $export['comment_preview_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_room';
   $strongarm->value = '1';
   $export['comment_preview_room'] = $strongarm;
@@ -195,6 +230,13 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_subject_field_page';
+  $strongarm->value = 1;
+  $export['comment_subject_field_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_room';
   $strongarm->value = 1;
   $export['comment_subject_field_room'] = $strongarm;
@@ -335,6 +377,42 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_page';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_room';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_room'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_schedule_item';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_session';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_session'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_time_slot';
   $strongarm->value = array(
     0 => 'main-menu',
@@ -344,6 +422,34 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_page';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_room';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_room'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_schedule_item';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_session';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_session'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_time_slot';
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_time_slot'] = $strongarm;
@@ -400,6 +506,34 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_page';
+  $strongarm->value = '1';
+  $export['node_preview_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_room';
+  $strongarm->value = '1';
+  $export['node_preview_room'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_schedule_item';
+  $strongarm->value = '1';
+  $export['node_preview_schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_session';
+  $strongarm->value = '1';
+  $export['node_preview_session'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'node_preview_time_slot';
   $strongarm->value = '1';
   $export['node_preview_time_slot'] = $strongarm;
@@ -414,6 +548,27 @@ function cod_session_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_room';
+  $strongarm->value = 1;
+  $export['node_submitted_room'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_schedule_item';
+  $strongarm->value = 1;
+  $export['node_submitted_schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_session';
+  $strongarm->value = 1;
+  $export['node_submitted_session'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'node_submitted_time_slot';
   $strongarm->value = 1;
   $export['node_submitted_time_slot'] = $strongarm;
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index 0b8caf4..3d11902 100755
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -338,7 +338,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  /* Field: Broken/missing handler */
+  /* Field: Global: View */
   $handler->display->display_options['fields']['view']['id'] = 'view';
   $handler->display->display_options['fields']['view']['table'] = 'views';
   $handler->display->display_options['fields']['view']['field'] = 'view';
@@ -432,7 +432,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
-  /* Field: Broken/missing handler */
+  /* Field: Global: View */
   $handler->display->display_options['fields']['view']['id'] = 'view';
   $handler->display->display_options['fields']['view']['table'] = 'views';
   $handler->display->display_options['fields']['view']['field'] = 'view';
diff --git a/cod_session_evaluations/cod_session_evaluations.features.inc b/cod_session_evaluations/cod_session_evaluations.features.inc
index 7626a69..deb4e26 100644
--- a/cod_session_evaluations/cod_session_evaluations.features.inc
+++ b/cod_session_evaluations/cod_session_evaluations.features.inc
@@ -18,7 +18,7 @@ function cod_session_evaluations_ctools_plugin_api() {
  * Implements hook_views_api().
  */
 function cod_session_evaluations_views_api() {
-  return array("version" => "3.0");
+  return array("api" => "3.0");
 }
 
 /**
diff --git a/cod_session_evaluations/cod_session_evaluations.features.user_permission.inc b/cod_session_evaluations/cod_session_evaluations.features.user_permission.inc
index 97b3284..6214249 100644
--- a/cod_session_evaluations/cod_session_evaluations.features.user_permission.inc
+++ b/cod_session_evaluations/cod_session_evaluations.features.user_permission.inc
@@ -14,7 +14,7 @@ function cod_session_evaluations_user_default_permissions() {
   $permissions['create session_evaluation content'] = array(
     'name' => 'create session_evaluation content',
     'roles' => array(
-      0 => 'authenticated user',
+      'authenticated user' => 'authenticated user',
     ),
     'module' => 'node',
   );
diff --git a/cod_session_evaluations/cod_session_evaluations.views_default.inc b/cod_session_evaluations/cod_session_evaluations.views_default.inc
index b63e3bf..049acb7 100644
--- a/cod_session_evaluations/cod_session_evaluations.views_default.inc
+++ b/cod_session_evaluations/cod_session_evaluations.views_default.inc
@@ -10,7 +10,7 @@
 function cod_session_evaluations_views_default_views() {
   $export = array();
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions_eval_report';
   $view->description = '';
   $view->tag = 'default';
@@ -23,6 +23,7 @@ function cod_session_evaluations_views_default_views() {
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Evaluation Report';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['link_display'] = 'page';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'edit field_accepted';
@@ -62,44 +63,22 @@ function cod_session_evaluations_views_default_views() {
       'empty_column' => 0,
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
   /* Relationship: Content: Author */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'node';
   $handler->display->display_options['relationships']['uid']['field'] = 'uid';
-  $handler->display->display_options['relationships']['uid']['required'] = 0;
   /* Relationship: Entity Reference: Referenced Entity */
   $handler->display->display_options['relationships']['field_eval_session_target_id']['id'] = 'field_eval_session_target_id';
   $handler->display->display_options['relationships']['field_eval_session_target_id']['table'] = 'field_data_field_eval_session';
   $handler->display->display_options['relationships']['field_eval_session_target_id']['field'] = 'field_eval_session_target_id';
-  $handler->display->display_options['relationships']['field_eval_session_target_id']['required'] = 1;
+  $handler->display->display_options['relationships']['field_eval_session_target_id']['required'] = TRUE;
   /* Field: Content: Session being evaluated */
   $handler->display->display_options['fields']['field_eval_session_1']['id'] = 'field_eval_session_1';
   $handler->display->display_options['fields']['field_eval_session_1']['table'] = 'field_data_field_eval_session';
   $handler->display->display_options['fields']['field_eval_session_1']['field'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session_1']['label'] = '';
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_eval_session_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'entityreference_entity_id';
-  $handler->display->display_options['fields']['field_eval_session_1']['field_api_classes'] = 0;
   /* Field: Evaluation link */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -107,78 +86,24 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['nothing']['ui_name'] = 'Evaluation link';
   $handler->display->display_options['fields']['nothing']['label'] = 'Evaluation Link';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = 'Evaluations';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['nothing']['alter']['path'] = 'sessions-eval/[field_eval_session_1]';
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
   $handler->display->display_options['fields']['nothing']['alter']['alt'] = 'Evaluation';
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['nothing']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   /* Field: Content: Session being evaluated */
   $handler->display->display_options['fields']['field_eval_session']['id'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['table'] = 'field_data_field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['field'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['label'] = 'Session';
-  $handler->display->display_options['fields']['field_eval_session']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_eval_session']['type'] = 'entityreference_entity_view';
   $handler->display->display_options['fields']['field_eval_session']['settings'] = array(
     'view_mode' => 'listing',
   );
-  $handler->display->display_options['fields']['field_eval_session']['field_api_classes'] = 0;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_target_id';
   $handler->display->display_options['fields']['field_accepted']['label'] = 'Session Status';
-  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
   /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
@@ -208,11 +133,10 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['label'] = 'Session being evaluated';
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
-  $handler->display->display_options['filters']['title']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['title']['expose']['multiple'] = FALSE;
 
   /* Display: Admin Eval Report */
   $handler = $view->new_display('page', 'Admin Eval Report', 'page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'conference-admin/sessions/evaluations';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Evaluations';
@@ -221,6 +145,7 @@ function cod_session_evaluations_views_default_views() {
 
   /* Display: Data export */
   $handler = $view->new_display('views_data_export', 'Data export', 'views_data_export_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['style_plugin'] = 'views_data_export_csv';
@@ -237,53 +162,14 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['field_eval_session_1']['field'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session_1']['label'] = '';
   $handler->display->display_options['fields']['field_eval_session_1']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_eval_session_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_eval_session_1']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'node_reference_nid';
-  $handler->display->display_options['fields']['field_eval_session_1']['field_api_classes'] = 0;
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
   $handler->display->display_options['fields']['name']['field'] = 'name';
   $handler->display->display_options['fields']['name']['relationship'] = 'uid';
   $handler->display->display_options['fields']['name']['label'] = 'Evaluator';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['name']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['name']['link_to_user'] = 1;
-  $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
-  $handler->display->display_options['fields']['name']['format_username'] = 1;
   /* Field: Evaluation link */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -291,74 +177,20 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['nothing']['ui_name'] = 'Evaluation link';
   $handler->display->display_options['fields']['nothing']['label'] = 'Evaluation Link';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = 'sessions-eval/[field_eval_session_1]';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['nothing']['alter']['path'] = 'sessions-eval/[field_eval_session_1]';
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
   $handler->display->display_options['fields']['nothing']['alter']['alt'] = 'Evaluation';
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['nothing']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   /* Field: Content: Session being evaluated */
   $handler->display->display_options['fields']['field_eval_session']['id'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['table'] = 'field_data_field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['field'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session']['label'] = 'Session';
-  $handler->display->display_options['fields']['field_eval_session']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_eval_session']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_eval_session']['field_api_classes'] = 0;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_nid';
   $handler->display->display_options['fields']['field_accepted']['label'] = 'Session Status';
-  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
   $handler->display->display_options['path'] = 'conference-admin/sessions/evaluations/feed';
   $handler->display->display_options['displays'] = array(
     'page' => 'page',
@@ -367,6 +199,7 @@ function cod_session_evaluations_views_default_views() {
 
   /* Display: User Eval Report */
   $handler = $view->new_display('page', 'User Eval Report', 'page_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['access'] = FALSE;
   $handler->display->display_options['access']['type'] = 'role';
   $handler->display->display_options['access']['role'] = array(
@@ -384,25 +217,9 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Content: Session being evaluated (field_eval_session) */
   $handler->display->display_options['arguments']['field_eval_session_target_id']['id'] = 'field_eval_session_target_id';
@@ -410,12 +227,10 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['arguments']['field_eval_session_target_id']['field'] = 'field_eval_session_target_id';
   $handler->display->display_options['arguments']['field_eval_session_target_id']['default_action'] = 'not found';
   $handler->display->display_options['arguments']['field_eval_session_target_id']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['field_eval_session_target_id']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['field_eval_session_target_id']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['field_eval_session_target_id']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['field_eval_session_target_id']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_eval_session_target_id']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['field_eval_session_target_id']['not'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -432,7 +247,7 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['path'] = 'sessions-eval/%';
   $export['sessions_eval_report'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions_speaker_review';
   $view->description = '';
   $view->tag = 'default';
@@ -446,6 +261,7 @@ function cod_session_evaluations_views_default_views() {
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Sessions';
   $handler->display->display_options['css_class'] = 'view-grouped-list sessions-list';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'role';
   $handler->display->display_options['access']['role'] = array(
     2 => '2',
@@ -455,13 +271,10 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['query']['options']['distinct'] = TRUE;
   $handler->display->display_options['query']['options']['query_comment'] = FALSE;
   $handler->display->display_options['exposed_form']['type'] = 'basic';
-  $handler->display->display_options['exposed_form']['options']['autosubmit'] = 0;
-  $handler->display->display_options['exposed_form']['options']['autosubmit_hide'] = 1;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '20';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['pager']['options']['id'] = '0';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
     'title' => 'title',
@@ -506,134 +319,62 @@ function cod_session_evaluations_views_default_views() {
       'separator' => '',
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
   $handler->display->display_options['empty']['area']['label'] = 'No sessions';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no sessions with this status.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   /* Relationship: Content: Author */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'node';
   $handler->display->display_options['relationships']['uid']['field'] = 'uid';
-  $handler->display->display_options['relationships']['uid']['required'] = 0;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['title']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
   $handler->display->display_options['fields']['nid']['table'] = 'node';
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = '';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = 'Evaluations';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['nothing']['alter']['path'] = 'sessions-eval/[nid]';
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
   $handler->display->display_options['fields']['nothing']['alter']['alt'] = 'Evaluations';
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
-  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = FALSE;
   /* Contextual filter: User: Uid */
   $handler->display->display_options['arguments']['uid']['id'] = 'uid';
   $handler->display->display_options['arguments']['uid']['table'] = 'users';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['relationship'] = 'uid';
   $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
-  $handler->display->display_options['arguments']['uid']['title_enable'] = 1;
+  $handler->display->display_options['arguments']['uid']['title_enable'] = TRUE;
   $handler->display->display_options['arguments']['uid']['title'] = '%1 Sessions';
-  $handler->display->display_options['arguments']['uid']['breadcrumb_enable'] = 1;
+  $handler->display->display_options['arguments']['uid']['breadcrumb_enable'] = TRUE;
   $handler->display->display_options['arguments']['uid']['breadcrumb'] = 'Sessions';
   $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['uid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['uid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['uid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['uid']['not'] = 0;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
@@ -660,8 +401,7 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['filters']['field_track_value']['expose']['label'] = 'Track';
   $handler->display->display_options['filters']['field_track_value']['expose']['operator'] = 'field_track_value_op';
   $handler->display->display_options['filters']['field_track_value']['expose']['identifier'] = 'track';
-  $handler->display->display_options['filters']['field_track_value']['expose']['multiple'] = 1;
-  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
+  $handler->display->display_options['filters']['field_track_value']['expose']['multiple'] = TRUE;
   /* Filter criterion: Search: Search Terms */
   $handler->display->display_options['filters']['keys']['id'] = 'keys';
   $handler->display->display_options['filters']['keys']['table'] = 'search_index';
@@ -672,7 +412,6 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['filters']['keys']['expose']['label'] = 'Filter by keywords:';
   $handler->display->display_options['filters']['keys']['expose']['operator'] = 'keys_op';
   $handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
-  $handler->display->display_options['filters']['keys']['expose']['multiple'] = FALSE;
   /* Filter criterion: Content: Experience level (field_experience) */
   $handler->display->display_options['filters']['field_experience_value']['id'] = 'field_experience_value';
   $handler->display->display_options['filters']['field_experience_value']['table'] = 'field_data_field_experience';
@@ -683,9 +422,8 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience level';
   $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
   $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'experience_level';
-  $handler->display->display_options['filters']['field_experience_value']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['field_experience_value']['expose']['multiple'] = 1;
-  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
+  $handler->display->display_options['filters']['field_experience_value']['expose']['remember'] = TRUE;
+  $handler->display->display_options['filters']['field_experience_value']['expose']['multiple'] = TRUE;
 
   /* Display: Page: My Sessions */
   $handler = $view->new_display('page', 'Page: My Sessions', 'page_1');
@@ -693,21 +431,21 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['title'] = 'My Sessions';
   $handler->display->display_options['defaults']['css_class'] = FALSE;
   $handler->display->display_options['css_class'] = 'view-grouped-list sessions-list sessions-accepted';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['empty'] = FALSE;
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
   $handler->display->display_options['empty']['area']['label'] = 'No accepted sessions';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'No sessions have been accepted yet. When you accept unprocessed sessions, they will show up here.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   /* Sort criterion: Content: Title */
   $handler->display->display_options['sorts']['title']['id'] = 'title';
   $handler->display->display_options['sorts']['title']['table'] = 'node';
   $handler->display->display_options['sorts']['title']['field'] = 'title';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
diff --git a/cod_special_events/cod_special_events.features.field.inc b/cod_special_events/cod_special_events.features.field.inc
new file mode 100644
index 0000000..8923781
--- /dev/null
+++ b/cod_special_events/cod_special_events.features.field.inc
@@ -0,0 +1,667 @@
+<?php
+/**
+ * @file
+ * cod_special_events.features.field.inc
+ */
+
+/**
+ * Implements hook_field_default_fields().
+ */
+function cod_special_events_field_default_fields() {
+  $fields = array();
+
+  // Exported field: 'node-special_event-body'.
+  $fields['node-special_event-body'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(
+        0 => 'node',
+      ),
+      'field_name' => 'body',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(
+        'format' => array(
+          'columns' => array(
+            'format' => 'format',
+          ),
+          'table' => 'filter_format',
+        ),
+      ),
+      'indexes' => array(
+        'format' => array(
+          0 => 'format',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'text',
+      'settings' => array(
+        'field_permissions' => array(
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
+          'view' => 'view',
+          'view own' => 0,
+        ),
+      ),
+      'translatable' => '1',
+      'type' => 'text_with_summary',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'hidden',
+          'module' => 'text',
+          'settings' => array(),
+          'type' => 'text_default',
+          'weight' => 0,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'hidden',
+          'module' => 'text',
+          'settings' => array(
+            'trim_length' => 600,
+          ),
+          'type' => 'text_summary_or_trimmed',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'body',
+      'label' => 'Body',
+      'required' => FALSE,
+      'settings' => array(
+        'display_summary' => TRUE,
+        'text_processing' => 1,
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'module' => 'text',
+        'settings' => array(
+          'rows' => 20,
+          'summary_rows' => 5,
+        ),
+        'type' => 'text_textarea_with_summary',
+        'weight' => '1',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-field_dates'.
+  $fields['node-special_event-field_dates'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_dates',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(),
+      'indexes' => array(),
+      'locked' => '0',
+      'module' => 'date',
+      'settings' => array(
+        'cache_count' => '4',
+        'cache_enabled' => 0,
+        'granularity' => array(
+          'day' => 'day',
+          'hour' => 'hour',
+          'minute' => 'minute',
+          'month' => 'month',
+          'second' => 0,
+          'year' => 'year',
+        ),
+        'timezone_db' => 'UTC',
+        'todate' => 'optional',
+        'tz_handling' => 'site',
+      ),
+      'translatable' => '0',
+      'type' => 'datestamp',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'date',
+          'settings' => array(
+            'format_type' => 'long',
+            'fromto' => 'both',
+            'multiple_from' => '',
+            'multiple_number' => '',
+            'multiple_to' => '',
+          ),
+          'type' => 'date_default',
+          'weight' => 1,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_dates',
+      'label' => 'Dates',
+      'required' => 1,
+      'settings' => array(
+        'default_value' => 'now',
+        'default_value2' => 'same',
+        'default_value_code' => '',
+        'default_value_code2' => '',
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'date',
+        'settings' => array(
+          'increment' => '15',
+          'input_format' => 'm/d/Y - H:i:s',
+          'input_format_custom' => '',
+          'label_position' => 'above',
+          'text_parts' => array(),
+          'year_range' => '-3:+3',
+        ),
+        'type' => 'date_popup',
+        'weight' => '2',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-field_event_product'.
+  $fields['node-special_event-field_event_product'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_event_product',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(
+        'product_id' => array(
+          'columns' => array(
+            'product_id' => 'product_id',
+          ),
+          'table' => 'commerce_product',
+        ),
+      ),
+      'indexes' => array(
+        'product_id' => array(
+          0 => 'product_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'commerce_product_reference',
+      'settings' => array(),
+      'translatable' => '0',
+      'type' => 'commerce_product_reference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'commerce_cart',
+          'settings' => array(
+            'combine' => TRUE,
+            'default_quantity' => 1,
+            'line_item_type' => 'product',
+            'show_quantity' => FALSE,
+            'show_single_product_attributes' => FALSE,
+          ),
+          'type' => 'commerce_cart_add_to_cart_form',
+          'weight' => 5,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_event_product',
+      'label' => 'Product',
+      'required' => 0,
+      'settings' => array(
+        'field_injection' => 1,
+        'referenceable_types' => array(
+          'cod_paid_event' => 0,
+          'product' => 0,
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'inline_entity_form',
+        'settings' => array(
+          'fields' => array(),
+          'type_settings' => array(
+            'allow_existing' => 0,
+            'autogenerate_title' => 1,
+            'delete_references' => 0,
+            'match_operator' => 'CONTAINS',
+            'use_variation_language' => 0,
+          ),
+        ),
+        'type' => 'inline_entity_form',
+        'weight' => '6',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-field_image_cache'.
+  $fields['node-special_event-field_image_cache'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_image_cache',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(
+        'fid' => array(
+          'columns' => array(
+            'fid' => 'fid',
+          ),
+          'table' => 'file_managed',
+        ),
+      ),
+      'indexes' => array(
+        'fid' => array(
+          0 => 'fid',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'image',
+      'settings' => array(
+        'default_image' => 0,
+        'uri_scheme' => 'public',
+      ),
+      'translatable' => '0',
+      'type' => 'image',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'image',
+          'settings' => array(
+            'image_link' => '',
+            'image_style' => '',
+          ),
+          'type' => 'image',
+          'weight' => 2,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_image_cache',
+      'label' => 'Image',
+      'required' => 0,
+      'settings' => array(
+        'alt_field' => 0,
+        'default_image' => 0,
+        'file_directory' => '',
+        'file_extensions' => 'png gif jpg jpeg',
+        'max_filesize' => '',
+        'max_resolution' => '',
+        'min_resolution' => '',
+        'title_field' => 0,
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'image',
+        'settings' => array(
+          'preview_image_style' => 'thumbnail',
+          'progress_indicator' => 'throbber',
+        ),
+        'type' => 'image_image',
+        'weight' => '3',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-field_paid_event'.
+  $fields['node-special_event-field_paid_event'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_paid_event',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(),
+      'indexes' => array(
+        'value' => array(
+          0 => 'value',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'list',
+      'settings' => array(
+        'allowed_values' => array(
+          0 => '',
+          1 => 'This is a paid event',
+        ),
+        'allowed_values_function' => '',
+      ),
+      'translatable' => '0',
+      'type' => 'list_boolean',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'default_value' => array(
+        0 => array(
+          'value' => 0,
+        ),
+      ),
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'list',
+          'settings' => array(),
+          'type' => 'list_default',
+          'weight' => 3,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_paid_event',
+      'label' => 'Paid Event',
+      'required' => 0,
+      'settings' => array(
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'options',
+        'settings' => array(
+          'display_label' => 0,
+        ),
+        'type' => 'options_onoff',
+        'weight' => '4',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-field_registration'.
+  $fields['node-special_event-field_registration'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_registration',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(
+        'registration_type' => array(
+          'columns' => array(
+            'registration_type' => 'name',
+          ),
+          'table' => 'registration_type',
+        ),
+      ),
+      'indexes' => array(
+        'registration_type' => array(
+          0 => 'registration_type',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'registration',
+      'settings' => array(),
+      'translatable' => '0',
+      'type' => 'registration',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'default_value' => array(
+        0 => array(
+          'registration_type' => 'free_event',
+        ),
+      ),
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'registration',
+          'settings' => array(),
+          'type' => 'registration_default',
+          'weight' => 4,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_registration',
+      'label' => 'Registration',
+      'required' => 0,
+      'settings' => array(
+        'default_registration_settings' => array(
+          'capacity' => '0',
+          'reminder' => array(
+            'reminder_settings' => array(
+              'reminder_date' => '',
+              'reminder_template' => '',
+            ),
+            'send_reminder' => 0,
+          ),
+          'scheduling' => array(
+            'close' => '',
+            'open' => '',
+          ),
+          'settings' => array(
+            'from_address' => 'info@cod7.com',
+            'multiple_registrations' => 0,
+          ),
+          'status' => 1,
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 0,
+        'module' => 'registration',
+        'settings' => array(),
+        'type' => 'registration_select',
+        'weight' => '5',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-special_event-og_group_ref'.
+  $fields['node-special_event-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'special_event',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 6,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 8,
+      ),
+    ),
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Body');
+  t('Dates');
+  t('Groups audience');
+  t('Image');
+  t('Paid Event');
+  t('Product');
+  t('Registration');
+
+  return $fields;
+}
diff --git a/cod_special_events/cod_special_events.features.inc b/cod_special_events/cod_special_events.features.inc
new file mode 100644
index 0000000..70a3fb7
--- /dev/null
+++ b/cod_special_events/cod_special_events.features.inc
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @file
+ * cod_special_events.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function cod_special_events_ctools_plugin_api() {
+  list($module, $api) = func_get_args();
+  if ($module == "strongarm" && $api == "strongarm") {
+    return array("version" => "1");
+  }
+}
+
+/**
+ * Implements hook_node_info().
+ */
+function cod_special_events_node_info() {
+  $items = array(
+    'special_event' => array(
+      'name' => t('Special Event'),
+      'base' => 'node_content',
+      'description' => t('A special event is part of a larger conference, meeting or event such as; VIP party, business networking party, after-party or participant excursion.  The special event has a separate paid or free event registration. '),
+      'has_title' => '1',
+      'title_label' => t('Title'),
+      'help' => '',
+    ),
+  );
+  return $items;
+}
diff --git a/cod_special_events/cod_special_events.info b/cod_special_events/cod_special_events.info
new file mode 100644
index 0000000..f1945c5
--- /dev/null
+++ b/cod_special_events/cod_special_events.info
@@ -0,0 +1,46 @@
+name = COD Special Events
+description = COD Special events such as VIP parties or participant excursions. 
+core = 7.x
+package = COD
+php = 5.2.4
+version = 7.x-2.0
+dependencies[] = commerce_cart
+dependencies[] = commerce_product_reference
+dependencies[] = ctools
+dependencies[] = date
+dependencies[] = entityreference
+dependencies[] = features
+dependencies[] = field_sql_storage
+dependencies[] = image
+dependencies[] = inline_entity_form
+dependencies[] = list
+dependencies[] = node
+dependencies[] = og
+dependencies[] = og_ui
+dependencies[] = options
+dependencies[] = registration
+dependencies[] = strongarm
+dependencies[] = text
+features[ctools][] = strongarm:strongarm:1
+features[features_api][] = api:1
+features[field][] = node-special_event-body
+features[field][] = node-special_event-field_dates
+features[field][] = node-special_event-field_event_product
+features[field][] = node-special_event-field_image_cache
+features[field][] = node-special_event-field_paid_event
+features[field][] = node-special_event-field_registration
+features[field][] = node-special_event-og_group_ref
+features[node][] = special_event
+features[variable][] = comment_anonymous_special_event
+features[variable][] = comment_default_mode_special_event
+features[variable][] = comment_default_per_page_special_event
+features[variable][] = comment_form_location_special_event
+features[variable][] = comment_preview_special_event
+features[variable][] = comment_special_event
+features[variable][] = comment_subject_field_special_event
+features[variable][] = field_bundle_settings_node__special_event
+features[variable][] = menu_options_special_event
+features[variable][] = menu_parent_special_event
+features[variable][] = node_options_special_event
+features[variable][] = node_preview_special_event
+features[variable][] = node_submitted_special_event
diff --git a/cod_special_events/cod_special_events.module b/cod_special_events/cod_special_events.module
new file mode 100644
index 0000000..9805d97
--- /dev/null
+++ b/cod_special_events/cod_special_events.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the cod_special_events feature.
+ */
+
+include_once 'cod_special_events.features.inc';
diff --git a/cod_special_events/cod_special_events.strongarm.inc b/cod_special_events/cod_special_events.strongarm.inc
new file mode 100644
index 0000000..1e29b40
--- /dev/null
+++ b/cod_special_events/cod_special_events.strongarm.inc
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @file
+ * cod_special_events.strongarm.inc
+ */
+
+/**
+ * Implements hook_strongarm().
+ */
+function cod_special_events_strongarm() {
+  $export = array();
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_anonymous_special_event';
+  $strongarm->value = 0;
+  $export['comment_anonymous_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_mode_special_event';
+  $strongarm->value = 1;
+  $export['comment_default_mode_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_per_page_special_event';
+  $strongarm->value = '50';
+  $export['comment_default_per_page_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_form_location_special_event';
+  $strongarm->value = 1;
+  $export['comment_form_location_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_preview_special_event';
+  $strongarm->value = '0';
+  $export['comment_preview_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_special_event';
+  $strongarm->value = '1';
+  $export['comment_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_subject_field_special_event';
+  $strongarm->value = 1;
+  $export['comment_subject_field_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__special_event';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+        'path' => array(
+          'weight' => '7',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_special_event';
+  $strongarm->value = array(
+    0 => 'main-menu',
+  );
+  $export['menu_options_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_special_event';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_options_special_event';
+  $strongarm->value = array(
+    0 => 'status',
+    1 => 'promote',
+  );
+  $export['node_options_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_special_event';
+  $strongarm->value = '1';
+  $export['node_preview_special_event'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_special_event';
+  $strongarm->value = 0;
+  $export['node_submitted_special_event'] = $strongarm;
+
+  return $export;
+}
diff --git a/cod_sponsors/cod_sponsors.features.field.inc b/cod_sponsors/cod_sponsors.features.field.inc
index aae6998..cec63b0 100644
--- a/cod_sponsors/cod_sponsors.features.field.inc
+++ b/cod_sponsors/cod_sponsors.features.field.inc
@@ -447,9 +447,116 @@ function cod_sponsors_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-sponsor-og_group_ref'.
+  $fields['node-sponsor-og_group_ref'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'og_group_ref',
+      'foreign keys' => array(
+        'node' => array(
+          'columns' => array(
+            'target_id' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'target_id' => array(
+          0 => 'target_id',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'og',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'og_behavior' => array(
+              'status' => TRUE,
+            ),
+          ),
+          'membership_type' => 'og_membership_type_default',
+          'target_bundles' => array(),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'target_type' => 'node',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'sponsor',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'og_ui',
+          'settings' => array(),
+          'type' => 'og_list_default',
+          'weight' => 6,
+        ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'og_group_ref',
+      'label' => 'Groups audience',
+      'required' => FALSE,
+      'settings' => array(
+        'behaviors' => array(
+          'og_widget' => array(
+            'admin' => array(
+              'widget_type' => 'entityreference_autocomplete',
+            ),
+            'default' => array(
+              'widget_type' => 'options_select',
+            ),
+            'status' => TRUE,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'view modes' => array(
+        'full' => array(
+          'custom settings' => FALSE,
+          'label' => 'Full',
+          'type' => 'og_list_default',
+        ),
+        'teaser' => array(
+          'custom settings' => FALSE,
+          'label' => 'Teaser',
+          'type' => 'og_list_default',
+        ),
+      ),
+      'widget' => array(
+        'module' => 'og',
+        'settings' => array(),
+        'type' => 'og_complex',
+        'weight' => 8,
+      ),
+    ),
+  );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Description');
+  t('Groups audience');
   t('Logo');
   t('Related Attendees');
   t('Sponsor URL');
diff --git a/cod_sponsors/cod_sponsors.features.taxonomy.inc b/cod_sponsors/cod_sponsors.features.taxonomy.inc
index 5ddaa9e..18e8484 100644
--- a/cod_sponsors/cod_sponsors.features.taxonomy.inc
+++ b/cod_sponsors/cod_sponsors.features.taxonomy.inc
@@ -16,6 +16,21 @@ function cod_sponsors_taxonomy_default_vocabularies() {
       'hierarchy' => '0',
       'module' => 'taxonomy',
       'weight' => '0',
+      'rdf_mapping' => array(
+        'rdftype' => array(
+          0 => 'skos:ConceptScheme',
+        ),
+        'name' => array(
+          'predicates' => array(
+            0 => 'dc:title',
+          ),
+        ),
+        'description' => array(
+          'predicates' => array(
+            0 => 'rdfs:comment',
+          ),
+        ),
+      ),
     ),
   );
 }
diff --git a/cod_sponsors/cod_sponsors.info b/cod_sponsors/cod_sponsors.info
index 1790b82..652cb38 100644
--- a/cod_sponsors/cod_sponsors.info
+++ b/cod_sponsors/cod_sponsors.info
@@ -3,14 +3,17 @@ description = Record and highlight event sponsors.
 core = 7.x
 package = COD
 php = 5.2.4
+version = 7.x-2.0
 project = cod_sponsors
 dependencies[] = cod_base
+dependencies[] = cod_events
 dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = image
 dependencies[] = link
 dependencies[] = list
 dependencies[] = number
+dependencies[] = og_ui
 dependencies[] = options
 dependencies[] = strongarm
 dependencies[] = taxonomy
@@ -25,6 +28,7 @@ features[field][] = node-sponsor-field_sponsor_logo
 features[field][] = node-sponsor-field_sponsor_related_attendees
 features[field][] = node-sponsor-field_sponsor_sponsorship_level
 features[field][] = node-sponsor-field_sponsor_url
+features[field][] = node-sponsor-og_group_ref
 features[node][] = sponsor
 features[taxonomy][] = sponsorship_level
 features[user_permission][] = create sponsor content
