diff --git a/cod_base/cod_base.features.user_permission.inc b/cod_base/cod_base.features.user_permission.inc
old mode 100644
new mode 100755
index 5ada9dd835f38dcdaec39faefe17dc8ab6d668b1..40eae3af83ede685e902a5efa002474e567c88f8
--- a/cod_base/cod_base.features.user_permission.inc
+++ b/cod_base/cod_base.features.user_permission.inc
@@ -323,16 +323,6 @@ function cod_base_user_default_permissions() {
     'module' => 'pathauto',
   );
 
-  // Exported permission: use admin toolbar.
-  $permissions['use admin toolbar'] = array(
-    'name' => 'use admin toolbar',
-    'roles' => array(
-      0 => 'administrator',
-      1 => 'content editor',
-    ),
-    'module' => 'admin',
-  );
-
   // Exported permission: view advanced help index.
   $permissions['view advanced help index'] = array(
     'name' => 'view advanced help index',
diff --git a/cod_base/cod_base.info b/cod_base/cod_base.info
old mode 100644
new mode 100755
index 5c942810aecdc9e0b07add2801ca45a2c8386cca..5469a57ceeb20ba26c0d2ed68346b9ba070e0af0
--- a/cod_base/cod_base.info
+++ b/cod_base/cod_base.info
@@ -4,7 +4,6 @@ core = 7.x
 package = COD
 php = 5.2.4
 project = cod_base
-dependencies[] = admin
 dependencies[] = admin_menu
 dependencies[] = advanced_help
 dependencies[] = comment
diff --git a/cod_base/cod_base.module b/cod_base/cod_base.module
old mode 100644
new mode 100755
index 6dfff92b818b5c648610e6e2f42d713d4b7cca0f..d940055032cca620c66ece027755cfd613cb9a91
--- a/cod_base/cod_base.module
+++ b/cod_base/cod_base.module
@@ -6,6 +6,38 @@
 
 include_once('cod_base.features.inc');
 
+
+/**
+ * Implements hook_menu().
+ */
+function cod_base_menu() {
+  $items = array();
+
+  // Top level "Store" container.
+  $items['admin/conference'] = array(
+    'title' => 'Conference',
+    'description' => 'Administer your conference.',
+    'page callback' => 'system_admin_menu_block_page',
+    'access arguments' => array('access administration pages'),
+    'file path' => drupal_get_path('module', 'system'),
+    'file' => 'system.admin.inc',
+    'weight' => -7,
+  );
+  $items['admin/conference/config'] = array(
+    'title' => 'Configuration',
+    'description' => 'Configure settings and business rules for your store.',
+    'page callback' => 'system_admin_menu_block_page',
+    'access arguments' => array('access administration pages'),
+    'type' => MENU_NORMAL_ITEM,
+    'weight' => 50,
+    'file path' => drupal_get_path('module', 'system'),
+    'file' => 'system.admin.inc',
+  );
+
+  return $items;
+}
+
+
 /**
  * Implements hook_theme().
  */
diff --git a/cod_bof/cod_bof.features.field.inc b/cod_bof/cod_bof.features.field.inc
old mode 100644
new mode 100755
index be4ab6ab6db1de47255873291c4d1e4043b5148c..23d6ab8fd2ffe3922d584646dd82b575ceb92469
--- a/cod_bof/cod_bof.features.field.inc
+++ b/cod_bof/cod_bof.features.field.inc
@@ -10,7 +10,7 @@
 function cod_bof_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-bof_session-body'
+  // Exported field: 'node-bof_session-body'.
   $fields['node-bof_session-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -36,6 +36,7 @@ function cod_bof_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -62,6 +63,12 @@ function cod_bof_field_default_fields() {
           'type' => 'text_default',
           'weight' => 0,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'hidden',
           'module' => 'text',
@@ -89,163 +96,78 @@ function cod_bof_field_default_fields() {
           'summary_rows' => 5,
         ),
         'type' => 'text_textarea_with_summary',
-        'weight' => '-4',
+        'weight' => '1',
       ),
     ),
   );
 
-  // Exported field: 'node-bof_session-field_session_room'
-  $fields['node-bof_session-field_session_room'] = array(
+  // Exported field: 'node-bof_session-field_session_timeslot'.
+  $fields['node-bof_session-field_session_timeslot'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_room',
+      'field_name' => 'field_session_timeslot',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'field_collection_item' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'item_id',
           ),
-          'table' => 'node',
+          'table' => 'field_collection_item',
         ),
       ),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 'room',
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 0,
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'views',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 1,
+            ),
+          ),
+          'view' => array(
+            'args' => array(),
+            'display_name' => 'entityreference_1',
+            'view_name' => 'cod_session_timeslot',
+          ),
         ),
+        'target_type' => 'field_collection_item',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'bof_session',
       'default_value' => NULL,
+      'default_value_function' => '',
       'deleted' => '0',
-      'description' => 'Select room in which this BoF occurs.',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => 1,
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 3,
         ),
-        'teaser' => array(
+        'listing' => array(
           'label' => 'above',
           'settings' => array(),
           'type' => 'hidden',
           'weight' => 0,
         ),
-      ),
-      'entity_type' => 'node',
-      'field_name' => 'field_session_room',
-      'label' => 'Room',
-      'required' => 0,
-      'settings' => array(
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'options',
-        'settings' => array(),
-        'type' => 'options_buttons',
-        'weight' => '-2',
-      ),
-    ),
-  );
-
-  // Exported field: 'node-bof_session-field_session_slot'
-  $fields['node-bof_session-field_session_slot'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'field_session_slot',
-      'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
-      'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
-        ),
-      ),
-      'module' => 'node_reference',
-      'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 0,
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 'time_slot',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
-        ),
-      ),
-      'translatable' => '1',
-      'type' => 'node_reference',
-    ),
-    'field_instance' => array(
-      'bundle' => 'bof_session',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => 2,
-        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -254,10 +176,15 @@ function cod_bof_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_slot',
-      'label' => 'Time slot',
+      'field_name' => 'field_session_timeslot',
+      'label' => 'Session Time Slot(s)',
       'required' => 0,
       'settings' => array(
+        'behaviors' => array(
+          'prepopulate' => array(
+            'status' => 0,
+          ),
+        ),
         'user_register_form' => FALSE,
       ),
       'widget' => array(
@@ -265,7 +192,7 @@ function cod_bof_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => 0,
+        'weight' => '3',
       ),
     ),
   );
@@ -273,9 +200,7 @@ function cod_bof_field_default_fields() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Description');
-  t('Room');
-  t('Select room in which this BoF occurs.');
-  t('Time slot');
+  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 100644
new mode 100755
index f1287109af7b9168e7fe7099aeb1974ca4eee7d3..fa25e55b69b6c4463252dea4a4fb3f574208e132
--- a/cod_bof/cod_bof.features.inc
+++ b/cod_bof/cod_bof.features.inc
@@ -9,6 +9,10 @@
  */
 function cod_bof_ctools_plugin_api() {
   list($module, $api) = func_get_args();
+  if ($module == "field_group" && $api == "field_group") {
+    return array("version" => "1");
+  }
+  list($module, $api) = func_get_args();
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/cod_bof/cod_bof.features.user_permission.inc b/cod_bof/cod_bof.features.user_permission.inc
index a044ac10d9c4cb56fcb7aa5cd2a6a9baad1b8f35..5f0948fb93cd7e9516255b60a96e101db681afe5 100644
--- a/cod_bof/cod_bof.features.user_permission.inc
+++ b/cod_bof/cod_bof.features.user_permission.inc
@@ -10,7 +10,7 @@
 function cod_bof_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: create bof_session content
+  // Exported permission: create bof_session content.
   $permissions['create bof_session content'] = array(
     'name' => 'create bof_session content',
     'roles' => array(
@@ -19,13 +19,14 @@ function cod_bof_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete any bof_session content
+  // Exported permission: delete any bof_session content.
   $permissions['delete any bof_session content'] = array(
     'name' => 'delete any bof_session content',
     'roles' => array(),
+    'module' => 'node',
   );
 
-  // Exported permission: delete own bof_session content
+  // Exported permission: delete own bof_session content.
   $permissions['delete own bof_session content'] = array(
     'name' => 'delete own bof_session content',
     'roles' => array(
@@ -34,13 +35,14 @@ function cod_bof_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit any bof_session content
+  // Exported permission: edit any bof_session content.
   $permissions['edit any bof_session content'] = array(
     'name' => 'edit any bof_session content',
     'roles' => array(),
+    'module' => 'node',
   );
 
-  // Exported permission: edit own bof_session content
+  // Exported permission: edit own bof_session content.
   $permissions['edit own bof_session content'] = array(
     'name' => 'edit own bof_session content',
     'roles' => array(
diff --git a/cod_bof/cod_bof.field_group.inc b/cod_bof/cod_bof.field_group.inc
new file mode 100644
index 0000000000000000000000000000000000000000..cfc8906a5070f5ce26a7b4735761dc176b5b11c2
--- /dev/null
+++ b/cod_bof/cod_bof.field_group.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file
+ * cod_bof.field_group.inc
+ */
+
+/**
+ * Implements hook_field_group_info().
+ */
+function cod_bof_field_group_info() {
+  $export = array();
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_bof_schedule|node|bof_session|form';
+  $field_group->group_name = 'group_bof_schedule';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'bof_session';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Schedule Info',
+    'weight' => '2',
+    'children' => array(
+      0 => 'field_session_timeslot',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Schedule Info',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'classes' => '',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $export['group_bof_schedule|node|bof_session|form'] = $field_group;
+
+  return $export;
+}
diff --git a/cod_bof/cod_bof.info b/cod_bof/cod_bof.info
old mode 100644
new mode 100755
index 3a3a97194efcd37c540d38830c2cd95f1ca71190..61ef73c41284722dc9b823867382fe9f2b1614a7
--- a/cod_bof/cod_bof.info
+++ b/cod_bof/cod_bof.info
@@ -1,35 +1,42 @@
-name = "COD BoF Session"
-description = "BoFs are self-scheduled, unconference style sessions"
-core = "7.x"
-package = "COD"
-php = "5.2.4"
-dependencies[] = "cod_session"
-dependencies[] = "features"
-dependencies[] = "node_reference"
-dependencies[] = "strongarm"
-dependencies[] = "views"
-features[ctools][] = "strongarm:strongarm:1"
-features[ctools][] = "views:views_default:3.0"
-features[field][] = "node-bof_session-body"
-features[field][] = "node-bof_session-field_session_room"
-features[field][] = "node-bof_session-field_session_slot"
-features[node][] = "bof_session"
-features[user_permission][] = "create bof_session content"
-features[user_permission][] = "delete any bof_session content"
-features[user_permission][] = "delete own bof_session content"
-features[user_permission][] = "edit any bof_session content"
-features[user_permission][] = "edit own bof_session content"
-features[variable][] = "cod_unique_bof_session"
-features[variable][] = "comment_anonymous_bof_session"
-features[variable][] = "comment_bof_session"
-features[variable][] = "comment_default_mode_bof_session"
-features[variable][] = "comment_default_per_page_bof_session"
-features[variable][] = "comment_form_location_bof_session"
-features[variable][] = "comment_preview_bof_session"
-features[variable][] = "comment_subject_field_bof_session"
-features[variable][] = "menu_options_bof_session"
-features[variable][] = "menu_parent_bof_session"
-features[variable][] = "node_options_bof_session"
-features[variable][] = "node_preview_bof_session"
-features[variable][] = "node_submitted_bof_session"
-features[views_view][] = "bof_schedule"
+name = COD BoF Session
+description = BoFs are self-scheduled, unconference style sessions
+core = 7.x
+package = COD
+php = 5.2.4
+dependencies[] = cod_session
+dependencies[] = commons_wysiwyg
+dependencies[] = entityreference
+dependencies[] = features
+dependencies[] = field_group
+dependencies[] = options
+dependencies[] = strongarm
+dependencies[] = views
+dependencies[] = views_field_view
+features[ctools][] = field_group:field_group:1
+features[ctools][] = strongarm:strongarm:1
+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_group][] = group_bof_schedule|node|bof_session|form
+features[node][] = bof_session
+features[user_permission][] = create bof_session content
+features[user_permission][] = delete any bof_session content
+features[user_permission][] = delete own bof_session content
+features[user_permission][] = edit any bof_session content
+features[user_permission][] = edit own bof_session content
+features[variable][] = cod_unique_bof_session
+features[variable][] = comment_anonymous_bof_session
+features[variable][] = comment_bof_session
+features[variable][] = comment_default_mode_bof_session
+features[variable][] = comment_default_per_page_bof_session
+features[variable][] = comment_form_location_bof_session
+features[variable][] = comment_preview_bof_session
+features[variable][] = comment_subject_field_bof_session
+features[variable][] = field_bundle_settings_node__bof_session
+features[variable][] = menu_options_bof_session
+features[variable][] = menu_parent_bof_session
+features[variable][] = node_options_bof_session
+features[variable][] = node_preview_bof_session
+features[variable][] = node_submitted_bof_session
+features[views_view][] = cod_bof_schedule
diff --git a/cod_bof/cod_bof.module b/cod_bof/cod_bof.module
old mode 100644
new mode 100755
index 2d4252b1050dad485089b7870c33c2883296b178..8c403c59eb853ebffb845a5ff0269b3ace56eccb
--- a/cod_bof/cod_bof.module
+++ b/cod_bof/cod_bof.module
@@ -5,3 +5,51 @@
  */
 
 include_once('cod_bof.features.inc');
+
+function cod_bof_views_pre_view(&$view, &$display_id, &$args) {
+
+  if($view->name == 'sessions' && $display_id == 'block_3' && $args[1] == 'bof_session') {
+    $footer = cod_bof_get_bof_link($args[0]);
+    $options = array(
+      'id' => 'area',
+      'table' => 'views',
+      'field' => 'area',
+      'empty' => $footer['display'],
+      'content' => $footer['content'],
+      'format' => 'full_html',
+      'tokenize' => 0,
+    );
+    $view->set_item('block_3', 'footer', 'area', $options);
+  }
+}
+
+function cod_bof_get_bof_link($time_slot_entity) {
+  //dpm($room_nid . ' and ' . $time_nid);
+  $field_collection_item = field_collection_item_load($time_slot_entity); // Load that field collection item.
+
+  $footer['display'] = FALSE;
+  $footer['content'] = '';
+
+  /* find out if there are any sessions currently assigned to a room at a given time */
+  $result = db_select('field_data_field_session_timeslot', 'f')
+    ->fields('f', array('field_session_timeslot_target_id'))
+    ->condition('field_session_timeslot_target_id', $time_slot_entity)
+    ->execute();
+  $bof_count = $result->rowCount();
+
+  $bof_allowed = FALSE;
+  foreach($field_collection_item->field_slot_types_allowed[LANGUAGE_NONE] AS $slot_types) {
+    if($slot_types['value'] == 'bof_session') {
+      $bof_allowed = TRUE;
+    }
+  }
+  if(!empty($field_collection_item->field_slot_types_capacity)) {
+    if($bof_allowed && $bof_count < $field_collection_item->field_slot_types_capacity[LANGUAGE_NONE][0]['value']) {
+      if(user_access('create bof_session content')) {
+        $footer['content'] = l('Create a BoF','node/add/bof-session',array('query' => array('edit[field_session_timeslot][target_id]' => $time_slot_entity, 'destination' => 'program/schedule/bofs')));
+        $footer['display'] = TRUE;
+      }
+    }
+  }
+  return $footer;
+}
\ No newline at end of file
diff --git a/cod_bof/cod_bof.strongarm.inc b/cod_bof/cod_bof.strongarm.inc
old mode 100644
new mode 100755
index c8a0685845732c54d5932393b1fd00b327f970b9..2f3c87dc5c71f486d4161275cbc0a302d1594c33
--- a/cod_bof/cod_bof.strongarm.inc
+++ b/cod_bof/cod_bof.strongarm.inc
@@ -10,63 +10,83 @@
 function cod_bof_strongarm() {
   $export = array();
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'cod_unique_bof_session';
   $strongarm->value = 'multiple';
   $export['cod_unique_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = 0;
   $export['comment_anonymous_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_bof_session';
   $strongarm->value = '2';
   $export['comment_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = 1;
   $export['comment_default_mode_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = '50';
   $export['comment_default_per_page_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = 1;
   $export['comment_form_location_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = '1';
   $export['comment_preview_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = 1;
   $export['comment_subject_field_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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__bof_session';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+        'path' => array(
+          'weight' => '4',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__bof_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_bof_session';
@@ -75,14 +95,14 @@ function cod_bof_strongarm() {
   );
   $export['menu_options_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
@@ -92,14 +112,14 @@ function cod_bof_strongarm() {
   );
   $export['node_options_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
   $strongarm->value = '1';
   $export['node_preview_bof_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $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_bof_session';
diff --git a/cod_bof/cod_bof.views_default.inc b/cod_bof/cod_bof.views_default.inc
old mode 100644
new mode 100755
index 33d959848ac5d2f78c3e570549b5ca8ca52d6631..e5e7ddc22fda35acbeffc6c8291c54ce955e67c5
--- a/cod_bof/cod_bof.views_default.inc
+++ b/cod_bof/cod_bof.views_default.inc
@@ -10,12 +10,12 @@
 function cod_bof_views_default_views() {
   $export = array();
 
-  $view = new view;
-  $view->name = 'bof_schedule';
-  $view->description = '';
-  $view->tag = 'default';
+  $view = new view();
+  $view->name = 'cod_bof_schedule';
+  $view->description = 'Conference Organizing Scheduler Admin View';
+  $view->tag = 'cod';
   $view->base_table = 'node';
-  $view->human_name = 'BoFs';
+  $view->human_name = 'cod_bof_schedule';
   $view->core = 7;
   $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
@@ -23,79 +23,148 @@ function cod_bof_views_default_views() {
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'BoFs';
-  $handler->display->display_options['access']['type'] = 'none';
+  $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['query']['options']['query_comment'] = FALSE;
   $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'] = 'cod_session_schedule';
-  $handler->display->display_options['style_options']['schedule_interactive'] = '1';
-  $handler->display->display_options['style_options']['schedule_days'] = array(
-    'Friday May, 04 2012' => 0,
-    'Saturday May, 05 2012' => 0,
-    'Sunday May, 06 2012' => 0,
-    'Monday May, 07 2012' => 0,
+  $handler->display->display_options['pager']['type'] = 'none';
+  $handler->display->display_options['style_plugin'] = 'quicktabs';
+  $handler->display->display_options['style_options']['grouping'] = array(
+    0 => array(
+      'field' => 'field_slot_datetime',
+      'rendered' => 1,
+      'rendered_strip' => 1,
+    ),
   );
-  $handler->display->display_options['style_options']['interactive_type'] = 'bof_session';
+  $handler->display->display_options['style_options']['tab_style'] = 'Basic';
+  $handler->display->display_options['style_options']['tab_title_field'] = 'field_slot_datetime';
   $handler->display->display_options['row_plugin'] = 'fields';
+  /* Field: Content: Date and time */
+  $handler->display->display_options['fields']['field_slot_datetime']['id'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['field'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['label'] = '';
+  $handler->display->display_options['fields']['field_slot_datetime']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_slot_datetime']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_slot_datetime']['settings'] = array(
+    'format_type' => 'date_no_time_',
+    'fromto' => 'value',
+    'multiple_number' => '',
+    'multiple_from' => '',
+    'multiple_to' => '',
+  );
   /* 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']['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']['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']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Node: Edit link */
-  $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
-  $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['label'] = '';
-  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 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']['element_label_colon'] = FALSE;
+  /* 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';
+  $handler->display->display_options['fields']['view']['label'] = '';
+  $handler->display->display_options['fields']['view']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['view']['view'] = 'cod_session_schedule_entity';
+  $handler->display->display_options['fields']['view']['display'] = 'block';
+  $handler->display->display_options['fields']['view']['arguments'] = '[!nid]/bof_session';
+  /* Sort criterion: Content: Date and time (field_slot_datetime) */
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['field'] = 'field_slot_datetime_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'] = 0;
+  $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
-    'bof_session' => 'bof_session',
+    'time_slot' => 'time_slot',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
-  $handler->display->display_options['path'] = 'program/bofs';
-  $export['bof_schedule'] = $view;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['path'] = 'program/schedule/bofs';
+
+  /* Display: Block */
+  $handler = $view->new_display('block', 'Block', 'block_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $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;
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* 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;
+  /* 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']['element_label_colon'] = FALSE;
+  $handler->display->display_options['defaults']['sorts'] = FALSE;
+  $handler->display->display_options['defaults']['arguments'] = FALSE;
+  /* Contextual filter: Broken/missing handler */
+  $handler->display->display_options['arguments']['field_session_room_target_id']['id'] = 'field_session_room_target_id';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['table'] = 'field_data_field_session_room';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['field'] = 'field_session_room_target_id';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['default_action'] = 'empty';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_session_room_target_id']['summary_options']['items_per_page'] = '25';
+  /* Contextual filter: Broken/missing handler */
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['default_action'] = 'empty';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_session_slot_target_id']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* 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;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'bof_session' => 'bof_session',
+  );
+  $export['cod_bof_schedule'] = $view;
 
   return $export;
 }
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
old mode 100644
new mode 100755
index 3d1bd2f6dfe4fdd8d633f335b02e4e3e61cdabad..eecc0b370483ce59b000166a73631ae42b6d2692
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -10,6 +10,222 @@
 function cod_session_field_default_fields() {
   $fields = array();
 
+  // Exported field: 'field_collection_item-field_room_slots_types_allowed-field_slot_types_allowed'.
+  $fields['field_collection_item-field_room_slots_types_allowed-field_slot_types_allowed'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_slot_types_allowed',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(),
+      'indexes' => array(
+        'value' => array(
+          0 => 'value',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'field_select_ct',
+      'settings' => array(
+        'allowed_values' => array(
+          'bof_session' => 'bof_session',
+          'schedule_item' => 'schedule_item',
+          'session' => 'session',
+        ),
+        'allowed_values_function' => '',
+      ),
+      'translatable' => '0',
+      'type' => 'list_cts',
+    ),
+    'field_instance' => array(
+      'bundle' => 'field_room_slots_types_allowed',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'list',
+          'settings' => array(),
+          'type' => 'list_default',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'field_collection_item',
+      'field_name' => 'field_slot_types_allowed',
+      'label' => 'Allowed Schedule Types',
+      'required' => 1,
+      'settings' => array(
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'options',
+        'settings' => array(),
+        'type' => 'options_select',
+        'weight' => '1',
+      ),
+    ),
+  );
+
+  // Exported field: 'field_collection_item-field_room_slots_types_allowed-field_slot_types_capacity'.
+  $fields['field_collection_item-field_room_slots_types_allowed-field_slot_types_capacity'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_slot_types_capacity',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(),
+      'indexes' => array(),
+      'locked' => '0',
+      'module' => 'number',
+      'settings' => array(),
+      'translatable' => '0',
+      'type' => 'number_integer',
+    ),
+    'field_instance' => array(
+      'bundle' => 'field_room_slots_types_allowed',
+      'default_value' => array(
+        0 => array(
+          'value' => '1',
+        ),
+      ),
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'number',
+          'settings' => array(
+            'decimal_separator' => '.',
+            'prefix_suffix' => TRUE,
+            'scale' => 0,
+            'thousand_separator' => ' ',
+          ),
+          'type' => 'number_integer',
+          'weight' => 2,
+        ),
+      ),
+      'entity_type' => 'field_collection_item',
+      'field_name' => 'field_slot_types_capacity',
+      'label' => 'Types Capacity',
+      'required' => 1,
+      'settings' => array(
+        'max' => '',
+        'min' => '1',
+        'prefix' => '',
+        'suffix' => '',
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 0,
+        'module' => 'number',
+        'settings' => array(),
+        'type' => 'number',
+        'weight' => '3',
+      ),
+    ),
+  );
+
+  // Exported field: 'field_collection_item-field_room_slots_types_allowed-field_slot_types_time_slot'.
+  $fields['field_collection_item-field_room_slots_types_allowed-field_slot_types_time_slot'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_slot_types_time_slot',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      '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' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'nid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(
+            'time_slot' => 'time_slot',
+          ),
+        ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
+      ),
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'field_room_slots_types_allowed',
+      'default_value' => NULL,
+      'default_value_function' => '',
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 1,
+        ),
+      ),
+      'entity_type' => 'field_collection_item',
+      'field_name' => 'field_slot_types_time_slot',
+      'label' => 'Time Slot',
+      'required' => 1,
+      'settings' => array(
+        'behaviors' => array(
+          'prepopulate' => array(
+            'action' => 'hide',
+            'fallback' => 'none',
+            'skip_perm' => 'use admin toolbar',
+            'status' => 0,
+          ),
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'options',
+        'settings' => array(),
+        'type' => 'options_select',
+        'weight' => '2',
+      ),
+    ),
+  );
+
   // Exported field: 'node-page-body'.
   $fields['node-page-body'] = array(
     'field_config' => array(
@@ -349,42 +565,44 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_session_capacity'.
-  $fields['node-room-field_room_session_capacity'] = array(
+  // Exported field: 'node-room-field_room_slots_types_allowed'.
+  $fields['node-room-field_room_slots_types_allowed'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '1',
+      'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_room_session_capacity',
+      'field_name' => 'field_room_slots_types_allowed',
       'field_permissions' => array(
         'type' => '0',
       ),
       'foreign keys' => array(),
       'indexes' => array(),
       'locked' => '0',
-      'module' => 'number',
-      'settings' => array(),
+      'module' => 'field_collection',
+      'settings' => array(
+        'path' => '',
+      ),
       'translatable' => '0',
-      'type' => 'number_integer',
+      'type' => 'field_collection',
     ),
     'field_instance' => array(
       'bundle' => 'room',
-      'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Number of sessions or BoFs that this room can hold in a time slot. Used to allow multiple BoFs in the same room at the same time slot.',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'number',
+          'module' => 'field_collection',
           'settings' => array(
-            'decimal_separator' => '.',
-            'prefix_suffix' => TRUE,
-            'scale' => 0,
-            'thousand_separator' => ' ',
+            'add' => 'Add',
+            'delete' => 'Delete',
+            'description' => TRUE,
+            'edit' => 'Edit',
+            'view_mode' => 'full',
           ),
-          'type' => 'number_integer',
-          'weight' => '1',
+          'type' => 'field_collection_view',
+          'weight' => 4,
         ),
         'listing' => array(
           'label' => 'above',
@@ -400,22 +618,18 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_room_session_capacity',
-      'label' => 'Session capacity',
+      'field_name' => 'field_room_slots_types_allowed',
+      'label' => 'Allowed Slot Types',
       'required' => 0,
       'settings' => array(
-        'max' => '',
-        'min' => '',
-        'prefix' => '',
-        'suffix' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 0,
-        'module' => 'number',
+        'module' => 'field_collection',
         'settings' => array(),
-        'type' => 'number',
-        'weight' => '2',
+        'type' => 'field_collection_hidden',
+        'weight' => '31',
       ),
     ),
   );
@@ -591,23 +805,23 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_session_room'.
-  $fields['node-schedule_item-field_session_room'] = array(
+  // Exported field: 'node-schedule_item-field_session_timeslot'.
+  $fields['node-schedule_item-field_session_timeslot'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '1',
+      'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_room',
+      'field_name' => 'field_session_timeslot',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'node' => array(
+        'field_collection_item' => array(
           'columns' => array(
-            'target_id' => 'nid',
+            'target_id' => 'item_id',
           ),
-          'table' => 'node',
+          'table' => 'field_collection_item',
         ),
       ),
       'indexes' => array(
@@ -618,25 +832,20 @@ function cod_session_field_default_fields() {
       'locked' => '0',
       'module' => 'entityreference',
       'settings' => array(
-        'handler' => 'base',
+        'handler' => 'views',
         'handler_settings' => array(
           'behaviors' => array(
             'views-select-list' => array(
-              'status' => 0,
+              'status' => 1,
             ),
           ),
-          'sort' => array(
-            'direction' => 'ASC',
-            'field' => 'body:value',
-            'property' => 'title',
-            'type' => 'property',
-          ),
-          'target_bundles' => array(
-            'room' => 'room',
+          'view' => array(
+            'args' => array(),
+            'display_name' => 'entityreference_1',
+            'view_name' => 'cod_session_timeslot',
           ),
         ),
-        'handler_submit' => 'Change handler',
-        'target_type' => 'node',
+        'target_type' => 'field_collection_item',
       ),
       'translatable' => '0',
       'type' => 'entityreference',
@@ -644,6 +853,7 @@ function cod_session_field_default_fields() {
     'field_instance' => array(
       'bundle' => 'schedule_item',
       'default_value' => NULL,
+      'default_value_function' => '',
       'deleted' => '0',
       'description' => '',
       'display' => array(
@@ -654,7 +864,7 @@ function cod_session_field_default_fields() {
             'link' => FALSE,
           ),
           'type' => 'entityreference_label',
-          'weight' => 8,
+          'weight' => 9,
         ),
         'listing' => array(
           'label' => 'above',
@@ -670,105 +880,15 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_room',
-      'label' => 'Room',
+      'field_name' => 'field_session_timeslot',
+      'label' => 'Session Time Slot(s)',
       'required' => 0,
       'settings' => array(
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'options',
-        'settings' => array(),
-        'type' => 'options_buttons',
-        'weight' => '9',
-      ),
-    ),
-  );
-
-  // Exported field: 'node-schedule_item-field_session_slot'.
-  $fields['node-schedule_item-field_session_slot'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'field_session_slot',
-      'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
+        'behaviors' => array(
+          'prepopulate' => array(
+            'status' => 0,
           ),
-          'table' => 'node',
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array(
-          0 => 'target_id',
         ),
-      ),
-      'locked' => '0',
-      'module' => 'entityreference',
-      'settings' => array(
-        'handler' => 'base',
-        'handler_settings' => array(
-          'behaviors' => array(
-            'views-select-list' => array(
-              'status' => 0,
-            ),
-          ),
-          'sort' => array(
-            'direction' => 'ASC',
-            'field' => 'body:value',
-            'property' => 'title',
-            'type' => 'property',
-          ),
-          'target_bundles' => array(
-            'time_slot' => 'time_slot',
-          ),
-        ),
-        'handler_submit' => 'Change handler',
-        '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' => 'entityreference',
-          'settings' => array(
-            'link' => FALSE,
-          ),
-          'type' => 'entityreference_label',
-          'weight' => 7,
-        ),
-        '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_session_slot',
-      'label' => 'Time Slot',
-      'required' => 0,
-      'settings' => array(
         'user_register_form' => FALSE,
       ),
       'widget' => array(
@@ -776,7 +896,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '8',
+        'weight' => '4',
       ),
     ),
   );
@@ -952,7 +1072,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '11',
+        'weight' => '32',
       ),
     ),
   );
@@ -1037,23 +1157,23 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session-field_session_room'.
-  $fields['node-session-field_session_room'] = array(
+  // Exported field: 'node-session-field_session_timeslot'.
+  $fields['node-session-field_session_timeslot'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '1',
+      'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_room',
+      'field_name' => 'field_session_timeslot',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'node' => array(
+        'field_collection_item' => array(
           'columns' => array(
-            'target_id' => 'nid',
+            'target_id' => 'item_id',
           ),
-          'table' => 'node',
+          'table' => 'field_collection_item',
         ),
       ),
       'indexes' => array(
@@ -1064,25 +1184,20 @@ function cod_session_field_default_fields() {
       'locked' => '0',
       'module' => 'entityreference',
       'settings' => array(
-        'handler' => 'base',
+        'handler' => 'views',
         'handler_settings' => array(
           'behaviors' => array(
             'views-select-list' => array(
-              'status' => 0,
+              'status' => 1,
             ),
           ),
-          'sort' => array(
-            'direction' => 'ASC',
-            'field' => 'body:value',
-            'property' => 'title',
-            'type' => 'property',
-          ),
-          'target_bundles' => array(
-            'room' => 'room',
+          'view' => array(
+            'args' => array(),
+            'display_name' => 'entityreference_1',
+            'view_name' => 'cod_session_timeslot',
           ),
         ),
-        'handler_submit' => 'Change handler',
-        'target_type' => 'node',
+        'target_type' => 'field_collection_item',
       ),
       'translatable' => '0',
       'type' => 'entityreference',
@@ -1090,8 +1205,9 @@ function cod_session_field_default_fields() {
     'field_instance' => array(
       'bundle' => 'session',
       'default_value' => NULL,
+      'default_value_function' => '',
       'deleted' => '0',
-      'description' => 'Select room(s) in which the session occurs.',
+      'description' => 'Select the relevant time slots this session should appear at.',
       'display' => array(
         'default' => array(
           'label' => 'above',
@@ -1100,7 +1216,7 @@ function cod_session_field_default_fields() {
             'link' => FALSE,
           ),
           'type' => 'entityreference_label',
-          'weight' => 11,
+          'weight' => 12,
         ),
         'listing' => array(
           'label' => 'above',
@@ -1116,105 +1232,15 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_room',
-      'label' => 'Room',
+      'field_name' => 'field_session_timeslot',
+      'label' => 'Session Time Slot(s)',
       'required' => 0,
       'settings' => array(
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'options',
-        'settings' => array(),
-        'type' => 'options_buttons',
-        'weight' => '10',
-      ),
-    ),
-  );
-
-  // Exported field: 'node-session-field_session_slot'.
-  $fields['node-session-field_session_slot'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'field_session_slot',
-      'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
+        'behaviors' => array(
+          'prepopulate' => array(
+            'status' => 0,
           ),
-          'table' => 'node',
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array(
-          0 => 'target_id',
         ),
-      ),
-      'locked' => '0',
-      'module' => 'entityreference',
-      'settings' => array(
-        'handler' => 'base',
-        'handler_settings' => array(
-          'behaviors' => array(
-            'views-select-list' => array(
-              'status' => 0,
-            ),
-          ),
-          'sort' => array(
-            'direction' => 'ASC',
-            'field' => 'body:value',
-            'property' => 'title',
-            'type' => 'property',
-          ),
-          'target_bundles' => array(
-            'time_slot' => 'time_slot',
-          ),
-        ),
-        'handler_submit' => 'Change handler',
-        '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' => 'entityreference',
-          'settings' => array(
-            'link' => FALSE,
-          ),
-          'type' => 'entityreference_label',
-          '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' => 'field_session_slot',
-      'label' => 'Time slot',
-      'required' => 0,
-      'settings' => array(
         'user_register_form' => FALSE,
       ),
       'widget' => array(
@@ -1222,7 +1248,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '9',
+        'weight' => '33',
       ),
     ),
   );
@@ -1601,7 +1627,7 @@ function cod_session_field_default_fields() {
           'text_parts' => array(),
           'year_range' => '-3:+3',
         ),
-        'type' => 'date_popup',
+        'type' => 'date_select',
         'weight' => '-4',
       ),
     ),
@@ -1609,23 +1635,23 @@ function cod_session_field_default_fields() {
 
   // Translatables
   // Included for use with string extractors like potx.
+  t('Allowed Schedule Types');
+  t('Allowed Slot Types');
   t('Body');
   t('Date and time');
   t('Description');
   t('Experience level');
-  t('Number of sessions or BoFs that this room can hold in a time slot. Used to allow multiple BoFs in the same room at the same time slot.');
   t('Photo');
-  t('Room');
-  t('Select room(s) in which the session occurs.');
-  t('Session capacity');
+  t('Select the relevant time slots this session should appear at.');
+  t('Session Time Slot(s)');
   t('Slides');
   t('Speaker(s)');
   t('Status');
   t('Time Slot');
-  t('Time slot');
   t('Total capacity of the room, in persons.');
   t('Total room capacity');
   t('Track');
+  t('Types Capacity');
   t('Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)');
 
   return $fields;
diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc
old mode 100644
new mode 100755
index d71cbc49fa6737e4e5c23c4333940e59b865ab28..16841d61716936caef2f0bf4722ae399327186d9
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -52,10 +52,12 @@ function cod_session_flag_default_flags() {
       ),
       'unflag' => array(),
     ),
-    'show_on_page' => 1,
-    'show_on_teaser' => 1,
+    'weight' => 0,
     'show_on_form' => 0,
     'access_author' => '',
+    'show_on_page' => 1,
+    'show_on_teaser' => 1,
+    'show_contextual_link' => FALSE,
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
@@ -84,10 +86,12 @@ function cod_session_flag_default_flags() {
       'flag' => array(),
       'unflag' => array(),
     ),
-    'show_on_page' => 1,
-    'show_on_teaser' => 0,
+    'weight' => 0,
     'show_on_form' => 0,
     'access_author' => '',
+    'show_on_page' => 1,
+    'show_on_teaser' => 0,
+    'show_contextual_link' => FALSE,
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
@@ -119,10 +123,12 @@ function cod_session_flag_default_flags() {
         0 => '4',
       ),
     ),
-    'show_on_page' => 1,
-    'show_on_teaser' => 0,
+    'weight' => 0,
     'show_on_form' => 0,
     'access_author' => '',
+    'show_on_page' => 1,
+    'show_on_teaser' => 0,
+    'show_contextual_link' => FALSE,
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
@@ -131,6 +137,7 @@ function cod_session_flag_default_flags() {
     'api_version' => 2,
   );
   return $flags;
+
 }
 
 /**
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
old mode 100644
new mode 100755
index 7a09ca5cb62e23b7e271828cd37d83634f215099..a8c6d7cd965e054321eac79f1d7982813e863503
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -163,24 +163,6 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: schedule schedule_item.
-  $permissions['schedule schedule_item'] = array(
-    'name' => 'schedule schedule_item',
-    'roles' => array(
-      0 => 'administrator',
-    ),
-    'module' => 'cod_session',
-  );
-
-  // Exported permission: schedule session.
-  $permissions['schedule session'] = array(
-    'name' => 'schedule session',
-    'roles' => array(
-      0 => 'administrator',
-    ),
-    'module' => 'cod_session',
-  );
-
   // Exported permission: view field_accepted.
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
diff --git a/cod_session/cod_session.field_group.inc b/cod_session/cod_session.field_group.inc
old mode 100644
new mode 100755
index c311b8385787761aba233aedf8a3fe1abaf20b1a..b7b486d42f18ca1b357f6920d3afabb2f00c49e3
--- a/cod_session/cod_session.field_group.inc
+++ b/cod_session/cod_session.field_group.inc
@@ -134,8 +134,7 @@ function cod_session_field_group_info() {
     'weight' => '1',
     'children' => array(
       0 => 'field_accepted',
-      1 => 'field_session_slot',
-      2 => 'field_session_room',
+      1 => 'field_session_timeslot',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -164,8 +163,7 @@ function cod_session_field_group_info() {
     'weight' => '4',
     'children' => array(
       0 => 'field_accepted',
-      1 => 'field_session_slot',
-      2 => 'field_session_room',
+      1 => 'field_session_timeslot',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
old mode 100644
new mode 100755
index 03bf809594b12a48094607e0286baa7025defee5..891596c5a8d77af8d4834c21e614cf89aa49a062
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -3,15 +3,17 @@ description = COD Session Scheduling & Voting
 core = 7.x
 package = COD
 php = 5.2.4
-project = cod_session
+project = cod_support
 dependencies[] = auto_nodetitle
 dependencies[] = cod_base
 dependencies[] = date
 dependencies[] = date_popup
 dependencies[] = entityreference
 dependencies[] = features
+dependencies[] = field_collection
 dependencies[] = field_group
 dependencies[] = field_permissions
+dependencies[] = field_select_ct
 dependencies[] = flag
 dependencies[] = image
 dependencies[] = list
@@ -25,25 +27,26 @@ dependencies[] = views
 dependencies[] = views_bulk_operations
 dependencies[] = views_content
 dependencies[] = views_ui
-datestamp = 1312320179
+datestamp = 1345248603
 features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
+features[field][] = field_collection_item-field_room_slots_types_allowed-field_slot_types_allowed
+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-room-body
 features[field][] = node-room-field_room_capacity
 features[field][] = node-room-field_room_photo
-features[field][] = node-room-field_room_session_capacity
+features[field][] = node-room-field_room_slots_types_allowed
 features[field][] = node-schedule_item-body
 features[field][] = node-schedule_item-field_accepted
-features[field][] = node-schedule_item-field_session_room
-features[field][] = node-schedule_item-field_session_slot
+features[field][] = node-schedule_item-field_session_timeslot
 features[field][] = node-session-body
 features[field][] = node-session-field_accepted
 features[field][] = node-session-field_experience
-features[field][] = node-session-field_session_room
-features[field][] = node-session-field_session_slot
+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
@@ -82,8 +85,6 @@ features[user_permission][] = edit any time_slot content
 features[user_permission][] = edit field_accepted
 features[user_permission][] = edit own field_accepted
 features[user_permission][] = edit own session content
-features[user_permission][] = schedule schedule_item
-features[user_permission][] = schedule session
 features[user_permission][] = view field_accepted
 features[user_role][] = session organizer
 features[variable][] = ant_pattern_time_slot
@@ -117,8 +118,10 @@ features[variable][] = comment_subject_field_schedule_item
 features[variable][] = comment_subject_field_session
 features[variable][] = comment_subject_field_time_slot
 features[variable][] = comment_time_slot
+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_time_slot
 features[variable][] = menu_parent_time_slot
 features[variable][] = node_options_page
@@ -130,6 +133,9 @@ features[variable][] = node_preview_time_slot
 features[variable][] = node_submitted_page
 features[variable][] = node_submitted_time_slot
 features[views_view][] = cod_schedule
+features[views_view][] = cod_session_timeslot
+features[views_view][] = cod_session_schedule_entity
+features[views_view][] = cod_session_schedule
 features[views_view][] = cod_time_slots
 features[views_view][] = schedule_room_list
 features[views_view][] = sessions
diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
old mode 100644
new mode 100755
index b9c940570efa19e10d00df1cfcaf8e86ae1a2f23..ddd2f50e03f3a77ff67dea027b9603038200f8ff
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -99,6 +99,7 @@ function cod_session_schedule_access($node_type = 'session', $account = NULL) {
  * Implements hook_menu().
  */
 function cod_session_menu() {
+  /*
   $items['scheduler-form/%'] = array(
     'title callback' => '_cod_session_scheduler_title',
     'title arguments' => array(1),
@@ -108,6 +109,35 @@ function cod_session_menu() {
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
   );
+  */
+  //TODO: make a schedule listing page or an ability to add days here...
+  $items['admin/conference/config/schedule'] = array(
+    'title' => 'Schedule Room Settings',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('cod_session_scheduler_form', 3),
+    'access callback' => 'cod_session_schedule_access',
+    'access arguments' => array(1),
+    'file' => 'cod_session_scheduler.inc',
+    'type' => MENU_NORMAL_ITEM,
+  );
+
+  $days = cod_session_days();
+  $weight = -1;
+  foreach($days AS $day_format => $day) {
+    $date = new DateObject($day_format, NULL, 'l F, d Y');
+    $items['admin/conference/config/schedule/'.date_format_date($date, 'custom', 'Y-m-d')] = array(
+      'title' => $day,
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('cod_session_scheduler_form', 4),
+      'access callback' => 'cod_session_schedule_access',
+      'access arguments' => array(1),
+      'file' => 'cod_session_scheduler.inc',
+      'type' => MENU_LOCAL_TASK,
+      'weight' => $weight,
+    );
+    $weight++;
+  }
+
   return $items;
 }
 
@@ -182,6 +212,7 @@ function cod_session_save_declined_message(&$form, &$form_state) {
 function cod_session_form_alter(&$form, &$form_state, $form_id) {
   // Prepopulate the current user into the Speakers field
   // on new session creation.
+
   if ($form_id == 'session_node_form') {
     if (isset($form['field_speakers'])) {
       // Form tweaks for the Speakers field:
@@ -212,8 +243,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
       // Use $_GET for room and slot.
       if (isset($_GET['edit'])) {
         // @todo does this work if the widget wasn't altered above?
-        $room_nid = $_GET['edit']['field_session_room']['nid']['nid'];
-        $slot_nid = $_GET['edit']['field_session_slot']['nid']['nid'];
+        $room_nid = $_GET['edit']['field_session_room']['target_id'];
+        $slot_nid = $_GET['edit']['field_session_slot']['target_id'];
       }
       elseif (!empty($form['#node']->nid) && !empty($form['#node']->field_session_room) && !empty($form['#node']->field_session_slot)) {
         // Get room and slot from node during node edit.
@@ -330,85 +361,15 @@ function cod_session_users_content($account, $type, $unscheduled = FALSE) {
   return $bofs;
 }
 
-/**
- * Custom schedule form.
- */
-function cod_session_schedule_form($form, &$form_state, $type) {
-  global $user;
-  $url_query = array();
-  // COD BoF uses Prepopulate so retrieve room and time slot from the request.
-  if (isset($_GET['edit'])) {
-    $room_nid = $_GET['edit']['field_session_room']['nid']['nid'];
-    $slot_nid = $_GET['edit']['field_session_slot']['nid']['nid'];
-    // Pass along Prepopulate and destination parameters in case the user
-    // chooses to add a new BoF.
-    $url_query = array(
-      'edit[field_session_room][nid][nid]' => $room_nid,
-      'edit[field_session_slot][nid][nid]' => $slot_nid,
-    );
-    $room = node_load($room_nid);
-    $slot = node_load($slot_nid);
-    // Sanity check that bad data wasn't passed.
-    if ($slot->type != 'time_slot' || $slot->status != 1 || $room->type != 'room' || $room->status != 1) {
-      drupal_access_denied();
-      return;
-    }
-  }
-  else {
-    // No arguments so 404.
-    drupal_not_found();
-    return;
-  }
-  $type_info = node_type_get_types();
-  $type_info = $type_info[$type];
+function cod_session_get_collection_entity($room_nid, $time_nid) {
+    //first, do we have an entity?
+  $sql = "SELECT s.field_room_slots_types_allowed_value
+    FROM {field_data_field_room_slots_types_allowed} s
+    INNER JOIN {field_data_field_slot_types_time_slot} st ON s.field_room_slots_types_allowed_value = st.entity_id
+    WHERE s.entity_id = :nid AND st.field_slot_types_time_slot_target_id = :time_nid";
+  $entity_id = db_query($sql, array(':nid' => $room_nid, ':time_nid' => $time_nid))->fetchField();
 
-  // Show unscheduled content for this user.
-  $sessions = cod_session_users_content($user, $type, TRUE);
-  if (empty($sessions)) {
-    // Unset destination to prevent drupal_goto() from following it.
-    unset($_GET['destination']);
-    // Redirect to node add if the user has no unscheduled content.
-    drupal_goto('node/add/' . $type, $url_query);
-  }
-
-  foreach ($sessions as $session) {
-    $options[$session->nid] = check_plain($session->title);
-  }
-  $form['session'] = array(
-    '#type' => 'radios',
-    '#title' => t('Pick a @name to schedule', array('@name' => $type_info->name)),
-    '#options' => $options,
-    '#default_value' => array_shift(array_keys($options)),
-  );
-  $url_query['destination'] = $_GET['destination'];
-  $form['add_session'] = array(
-    '#markup' => '<div>' . l(t('Add a new @name', array('@name' => $type_info->name)), 'node/add/' . str_replace('_', '-', $type), array('query' => $url_query)) . '</div>',
-  );
-
-  $time_range = cod_session_time_slot_format($slot);
-  $form['chosen'] = array(
-    '#type' => 'item',
-    '#title' => t('You have chosen'),
-    '#markup' => t('Room: @room <br/> Time: @day @start - @end', array('@day' => $time_range['day'], '@room' => $room->title, '@start' => $time_range['formatted_start'], '@end' => $time_range['formatted_end'])),
-  );
-  $form['schedule'] = array(
-    '#type' => 'value',
-    '#value' => array(
-      'room' => $room,
-      'slot' => $slot,
-    ),
-  );
-
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Confirm this time slot'),
-  );
-  $form_state['#redirect'] = $_GET['destination'];
-  $form['cancel'] = array(
-    '#markup' => l(t('Cancel'), $_GET['destination']),
-  );
-
-  return $form;
+  return $entity_id;
 }
 
 /**
@@ -509,10 +470,10 @@ function cod_session_node_presave($node) {
 function cod_session_node_validate($node, $form, &$form_state) {
   // If the node has a room and slot field, make sure there are no existing nodes that have the same room/slot combination.
   // Unless the node is not unique check room capacity.
-  if (!empty($node->field_session_slot['und'][0]['target_id']) && !empty($node->field_session_room['und'][0]['target_id'])) {
+  if (!empty($node->field_session_slot[LANGUAGE_NONE][0]['target_id']) && !empty($node->field_session_room[LANGUAGE_NONE][0]['target_id'])) {
     $slots = $rooms = array();
-    foreach ($node->field_session_slot as $slot) {
-      if (!empty($slot[0]['target_id'])) {
+    foreach ($node->field_session_slot[LANGUAGE_NONE] as $slot) {
+      if (!empty($slot['target_id'])) {
         $slots[] = $slot[0]['target_id'];
       }
     }
@@ -529,6 +490,8 @@ function cod_session_node_validate($node, $form, &$form_state) {
     $capacity = 0;
     if (count($rooms) == 1) {
       $room = current($rooms);
+      $ent = entity_load('field_collection_item',array($room->field_room_slots_types_allowed[LANGUAGE_NONE][0]['value']));
+      //is the session even allowed in this slot?
       if (isset($room->field_room_session_capacity[LANGUAGE_NONE][0]['value'])) {
         $capacity = $room->field_room_session_capacity[LANGUAGE_NONE][0]['value'];
       }
@@ -583,6 +546,9 @@ function cod_session_theme($existing, $type, $theme, $path) {
     'cod_session_declined_msg' => array(
       'render element' => 'msg',
     ),
+    'cod_session_scheduler_form' => array(
+  		'render element' => 'form'
+  	),
   );
 }
 
@@ -595,442 +561,6 @@ function theme_cod_session_declined_msg($variables) {
 }
 
 /**
- * Theme function to render the schedule grid.
- *
- * Build arrays of schedulable content, visible rooms, and time slots with
- * context-appropriate meta information like available schedulable slots.
- */
-function template_preprocess_cod_session_schedule(&$vars) {
-  global $user;
-  // Warning, this preprocess function is massive, like Godzilla eating the
-  // worlds largest pizza massive. It needs to be refactored and broken apart,
-  // but that has not yet happened, or you wouldn't be reading this. Attempts
-  // are made to document this code, but proceed and alter at risk.
-
-  // $view->result contains the raw data
-  // $vars['rows'] contains the row-formatted fields
-
-  $view = $vars['view'];
-
-  // Save raw row View results keyed on nid.
-  $view_results = $scheduled_items = $displayed_node_types = array();
-  $node_types = node_type_get_types();
-  foreach ($node_types as $type => $content_type) {
-    $fields = field_info_instances('node', $type);
-    $node_types[$type]->fields = (object) $fields;
-  }
-
-  if (!empty($view->result)) {
-    foreach ($view->result as $key => $view_result) {
-      $node = node_load($view_result->nid);
-      $scheduled_items[$node->nid] = $node;
-      // $view_results will be what is actually output in the tpl file.
-      $view_results[$node->nid] = $vars['rows'][$key];
-      // Hold onto node types seen in this View.
-      if (!in_array($node->type, $displayed_node_types)) {
-        $displayed_node_types[$node->type] = $node_types[$node->type];
-      }
-    }
-  }
-
-  // There is no contextual argument filter, but if a valid day
-  // argument is present, we modify the cod_schedule_days
-  // to only display that day overriden by the URL.
-  if(isset($view->args[0])) {
-    foreach ($view->cod_schedule_days as $day_key => $day_value) {
-      if(cod_session_day_url($day_value) == $view->args[0]) {
-        $view->cod_schedule_days[$day_key] = $day_value;
-      } elseif($view->args[0] != 'all') {
-        unset($view->cod_schedule_days[$day_key]);
-      }
-    }
-  }
-
-  // Get days of the schedule from the View style setting. This will be used
-  // when depicting day links and for determining time slots to appear on this
-  // day's grid.
-  $all_schedule_days = $view->cod_schedule_days;
-  // If an argument is present limit the schedule days.
-  $schedule_days = $all_schedule_days;
-  if (!empty($view->args[0])) {
-    if (array_key_exists($view->args[0], $all_schedule_days)) {
-      $schedule_days = array($view->args[0] => $all_schedule_days[$view->args[0]]);
-    }
-  }
-
-  // Get a list of time slots. The list can be powered by a View, see cod_session_day_slots().
-  // The list of sessions is not filtered by this list. A View filter argument should be used for that.
-  // @todo this won't allow different Views on the same day to show different time slots (maybe if one was sessions and the other bofs)?
-  $time_slots = array();
-  foreach ($schedule_days as $day_key => $day) {
-    // @todo Because Date does not yet provide granularity for date fields in
-    // contextual filters, I've set the second argument to be the date, rather
-    // than the key. (I'm thinking that's way the it should work anyway.)
-    // -- oadaeh 2012-01-21
-    $time_slots = array_merge($time_slots, cod_session_day_slots($view, $day));
-    //$time_slots = array_merge($time_slots, cod_session_day_slots($view, $day_key));
-  }
-  if (empty($time_slots)) {
-    // No time slots exist so do not continue.
-    return;
-  }
-
-  // Get a list of rooms. The list can be powered by the View schedule_room_list
-  $rooms = _cod_session_schedule_rooms($view);
-  if (empty($rooms)) {
-    // No rooms exist so do not continue.
-    return;
-  }
-
-  // Build an array of links to days to display at the top of the grid.
-  $day_links = array();
-  $current_path = $view->display_handler->display->display_options['path'];
-  if (!empty($view->args[0]) && count($all_schedule_days) > 1) {
-    foreach ($all_schedule_days as $day_key => $day) {
-      // @todo pass along links with attribute information?
-      $day_links[] = l($day, $current_path . '/' . $day_key);
-    }
-  }
-
-  // Build attributes for scheduled items.
-  // Consider revising architecture to be taxonomy or node reference to simplify the following.
-  $session_attrs = array();
-  foreach ($node_types as $type => $type_array) {
-    foreach ($type_array->fields as $field) {
-      if (in_array($field['widget']['type'], array('options_buttons', 'options_select', 'options_onoff'))) {
-        if (!isset($session_attrs[$field['field_name']])) {
-          // Allowed values of a field may or may not have machine-readable keys.
-          if (!empty($field['settings']['allowed_values_function']) || !empty($field['settings']['allowed_values'])) {
-            $allowed_values = list_allowed_values($field);
-            $session_attrs[$field['field_name']] = array(
-              'name' => $field['field_name'],
-              'values' => array_values($allowed_values),
-              'keys' => array_keys($allowed_values),
-              'machine_keys' => _cod_session_machine_keys($field['field_name'], array_keys($allowed_values)),
-            );
-          }
-        }
-      }
-    }
-  }
-
-  // Create text CCK optionwidgets as attributes of items for CSS usage.
-  // @todo review for sanitization
-  if (!empty($session_attrs)) {
-    foreach ($scheduled_items as $session_nid => $session) {
-      foreach ($session_attrs as $field) {
-        // See if field exists for particular session node.
-        if (is_array($session->$field['name'])) {
-          // Field could have multiple instances.
-          foreach ($session->$field['name'] as $instance) {
-            // Emtpy values are NULL.
-            if (isset($instance['value'])) {
-              // Create container if doesn't exist.
-              if (!isset($scheduled_items[$session_nid]->cod_session_classes)) {
-                $scheduled_items[$session_nid]->cod_session_classes = array();
-              }
-              $key = array_search($instance['value'], $field['values']);
-              if ($key === FALSE) {
-                // It's possible we've rewritten the keys.
-                $key = array_search($instance['value'], $field['keys']);
-                if ($key !== FALSE) {
-                  $value = $field['values'][$key];
-                }
-              }
-              else {
-                $value = $instance['value'];
-              }
-              if ($key !== FALSE) {
-                // Create class based on field key.
-                $scheduled_items[$session_nid]->cod_session_classes[$field['machine_keys'][$key]] = $value;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // Collect capacity information about rooms to inform availability processing.
-  $room_nids = array_keys($rooms);
-  foreach ($room_nids as $room_nid) {
-    // Explicitly get room capacity.
-    $node = node_load($room_nid);
-    if (!empty($node->field_room_session_capacity)) {
-      $capacity = check_plain($node->field_room_session_capacity[LANGUAGE_NONE][0]['value']);
-    }
-    else {
-      $capacity = 1;
-    }
-    $rooms[$room_nid]['capacity'] = $capacity;
-  }
-
-  // Load each slot.
-  // @todo This could be malperformant. Consider revising such that all slots
-  // are loaded with single query.
-  foreach ($time_slots as $slot) {
-    $node = node_load($slot->nid);
-    $slots[$node->nid] = $node;
-  }
-
-  // Create structured grid of scheduled items in format [slot][room][item_nid]
-  $used_slots = $item_grid = $used_rooms = $authored = array();
-
-  if (!empty($scheduled_items)) {
-    foreach ($scheduled_items as $item) {
-      if (!empty($item->field_session_slot['und'][0]['target_id'])) {
-        $target_slot = $item->field_session_slot['und'][0]['target_id'];
-      }
-      if (isset($target_slot) && !empty($item->field_session_room['und'][0]['target_id'])) {
-        if (!empty($item->cod_session_classes)) {
-          $class = ' ' . implode(' ', array_keys($item->cod_session_classes));
-        }
-        else {
-          $class = '';
-        }
-
-        // Handle sessions in multiple rooms.
-        foreach ($item->field_session_room['und'] as $room_instance) {
-          $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['session'] = $item;
-          $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['class'] = $class;
-          // Record rooms and used slots.
-          $used_rooms[$room_instance['target_id']][] = $target_slot;
-        }
-
-      // Create array of populated slots.
-        if (!in_array($target_slot, $used_slots)) {
-          $used_slots[] = $target_slot;
-        }
-      }
-      // Record sessions for this user, their call-to-action can use it.
-      if ($item->uid == $user->uid) {
-        $authored[] = $item->nid;
-      }
-    }
-
-    // Explicitly discover if there are unscheduled sessions by this user if
-    // the interactive workflow is enabled.
-    if ($view->cod_schedule_interactive) {
-      $authored = cod_session_users_content($user, $view->cod_interactive_type, TRUE);
-      if (!empty($authored)) {
-        $unscheduled_bofs = TRUE;
-      }
-    }
-  }
-
-  // Arrange slots by days.
-  // @todo Give plugin options for date formats and text?
-  $arranged_slots = array();
-  foreach ($slots as $slot) {
-    // Do not fill slots on non-interactive schedules that are not in use.
-    if (!$view->cod_schedule_interactive && !in_array($slot->nid, $used_slots)) {
-      continue;
-    }
-    // Make formatted times.
-    $time_format = cod_session_time_slot_format($slot);
-    $day_key = date_format_date($time_format['date_start'], 'custom', 'Y-m-d');
-    $timestamp = date_format_date($time_format['date_start'], 'custom', DATE_FORMAT_UNIX);
-    $arranged_slots[$day_key][$timestamp] = array(
-      'nid' => $slot->nid,
-      'start' => $time_format['formatted_start'],
-      'end' => $time_format['formatted_end'],
-      'class' => '',
-    );
-    // If interactive and row is empty include a class.
-    if ($view->cod_schedule_interactive && !in_array($slot->nid, $used_slots)) {
-      $arranged_slots[$day_key][$timestamp]['class'] = 'empty';
-    }
-    // Hold onto what slots go with a day_key so the empty rooms for a day can
-    // be easily calculated.
-    $days_slots[$day_key][] = $slot->nid;
-    if (!isset($days[$day_key])) {
-      $days[$day_key] = date_format_date($time_format['date_start'], 'custom', 'l F jS, Y');
-    }
-  }
-
-  // Sort the arranged slots.
-  cod_session_ksort_recurse($arranged_slots);
-
-  // Calculate unused rooms in each day. Unused rooms will be left off the grid
-  // if the room is not interactive and will be showing (to allow scheduling) if
-  // it is.
-  $empty_rooms = $show_rooms = array();
-  if (!empty($days_slots)) {
-    foreach ($room_nids as $room_nid) {
-      foreach ($days_slots as $day_key => $day_slots) {
-        $intersect = array();
-        if (!empty($used_rooms[$room_nid])) {
-          $intersect = array_intersect($used_rooms[$room_nid], $day_slots);
-        }
-        if (empty($intersect)) {
-          // Room not used on this day.
-          $empty_rooms[$day_key][$room_nid] = TRUE;
-          if ($view->cod_schedule_interactive) {
-            $show_rooms[$day_key][$room_nid] = TRUE;
-          }
-          else {
-            $show_rooms[$day_key][$room_nid] = FALSE;
-          }
-        }
-        else {
-          // Room is in use, so show it.
-          $show_rooms[$day_key][$room_nid] = TRUE;
-        }
-      }
-    }
-  }
-
-  $single_node_types = cod_session_single_schedulable_types();
-
-  // @todo get rooms for each day?
-  // Build schedule grid array. This is the final processing before handing over
-  // to the tpl file.
-  $schedule_grid = array();
-  if (!empty($days)) {
-    // For each day...
-    foreach ($days as $day_key => $day_title) {
-      $schedule_grid[$day_key] = array();
-      // For each slot...
-      foreach ($arranged_slots[$day_key] as $slot_key => $slot) {
-        $schedule_grid[$day_key][$slot['nid']] = array();
-        // For each room. $room_key is used for determing colspans.
-        foreach ($room_nids as $room_key => $room_nid) {
-          // Leave out empty rooms on non-interactive schedules.
-          if (!$view->cod_schedule_interactive && !empty($empty_rooms[$day_key][$room_nid])) {
-            continue;
-          }
-          // Collect sessions and availability and call-to-schedule information.
-          // The tpl file determines what to print. @todo make that determination here?
-
-          // Now at the level of depth of session_grid, that is [slot][room].
-          // If we have not already marked this room/slot combo as spanned, continue forward.
-          if (empty($schedule_grid[$day_key][$slot['nid']][$room_nid])) {
-            $schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'] = array();
-            $schedule_grid[$day_key][$slot['nid']][$room_nid]['class'] = '';
-            $schedule_grid[$day_key][$slot['nid']][$room_nid]['spanned'] = FALSE;
-
-            $available = $rooms[$room_nid]['capacity'];
-
-            // Check $item_grid for if items exists in this slot.
-            if (!empty($item_grid[$slot['nid']][$room_nid])) {
-              $colspan = 1;
-              // Record the session(s) in this room and slot.
-              // $item_grid[slot][room] is an array of sessions. Store sessions
-              // in $schedule_grid at [day][slot][room]['sessions'].
-              $schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'] = $item_grid[$slot['nid']][$room_nid];
-              // Count scheduled items.
-              $available = $available - count($item_grid[$slot['nid']][$room_nid]);
-              // Check for single item, to set uniqueness and colspan.
-              if (count($item_grid[$slot['nid']][$room_nid]) == 1) {
-                $this_session = current($item_grid[$slot['nid']][$room_nid]);
-                // Exclusive content types override non-exclusive.
-                $this_exclusive = variable_get('cod_unique_' . $this_session['session']->type, COD_SCHEDULE_SINGLE);
-                if ($this_exclusive == COD_SCHEDULE_SINGLE) {
-                  $available = 0;
-                }
-
-                // This slot has only one session, calculate colspans in time slot (row).
-                // @todo consider if session is in this and not next sequential room?
-                // Check for sessions in remaining rooms.
-                for ($i = $room_key + 1; $i < count($room_nids); $i++) {
-                  if (!empty($item_grid[$slot['nid']][$room_nids[$i]]) && count($item_grid[$slot['nid']][$room_nids[$i]]) == 1) {
-                    $adjacent = current($item_grid[$slot['nid']][$room_nids[$i]]);
-                    // Check to see if adjacent column matches.
-                    if ($this_session['session']->nid == $adjacent['session']->nid) {
-                      // We'll accommodate for this in the markup.
-                      $colspan++;
-                      // Mark the room/slot combo as spanned from the previous slot.
-                      $schedule_grid[$day_key][$slot['nid']][$room_nids[$i]]['spanned'] = TRUE;
-                      // Don't process adjacent room when setting schedule grid.
-                      unset($item_grid[$slot['nid']][$room_nids[$i]]);
-                    }
-                    else {
-                      // Adjacent session does not match.
-                      break;
-                    }
-                  }
-                  else {
-                    // Only consider those which are adjacent.
-                    break;
-                  }
-                }
-              }
-
-              // Set colspan.
-              $schedule_grid[$day_key][$slot['nid']][$room_nid]['colspan'] = $colspan;
-            }
-          }
-
-          // Check if there are any nodes with COD_SCHEDULE_SINGLE assigned to this room and time
-          // It is already by default that the room is not available if the session is COD_SCHEDULE_SINGLE
-          if ($view->cod_schedule_interactive && $available) {
-            $query = new EntityFieldQuery();
-            $entities = $query->entityCondition('entity_type', 'node')
-            ->propertyCondition('type', $single_node_types, 'IN')
-            ->fieldCondition('field_session_room', 'target_id', $room_nid)
-            ->fieldCondition('field_session_slot', 'target_id', $slot['nid'])
-            ->propertyCondition('status', 1)
-            ->range(0,1)
-            ->execute();
-            if (count($entities) > 0) {
-              $available = 0;
-            }
-          }
-
-          // Include room availability and call-to-action if this is an interactive
-          // schedule and user is allowed to create and schedule.
-          if ($view->cod_schedule_interactive && cod_session_schedule_access($view->cod_interactive_type, $user)) {
-            $type_url_str = str_replace('_', '-', $view->cod_interactive_type); // Oh, Drupal.
-            if ($available <= 0) {
-              $availability = ''; // Do not display anything if the room is full.
-              $schedule_grid[$day_key][$slot['nid']][$room_nid]['class'] .= ' full';
-            }
-            else {
-              $availability = t('@avail of @cap slots available', array('@avail' => $available, '@cap' => $rooms[$room_nid]['capacity']));
-              // There is availability so provide a call-to-action for scheduling.
-              $options = array(
-                'query' => array(
-                  // The session room field is unlimited so it would be rendered as
-                  // checkboxes but because it's being altered by cod_bof set the
-                  // Prepopulate arguments to what it will be, a select list.
-                  'edit[field_session_room][nid][nid]' => $room_nid,
-                  'edit[field_session_slot][nid][nid]' => $slot['nid'],
-                  'destination' => $_GET['q'], // @todo may be menu tab depth?
-                ),
-              );
-              // If the user has unscheduled items or has not submitted any
-              // they are given a link to add and otherwise a link to schedule.
-              if (!$authored || !$unscheduled_bofs) {
-                $cta = l(t('Add a @name', array('@name' => $node_types[$view->cod_interactive_type]->name)), 'node/add/' . $type_url_str, $options);
-              }
-              else {
-                $cta = l(t('Schedule a @name', array('@name' => $node_types[$view->cod_interactive_type]->name)), 'scheduler-form/' . $view->cod_interactive_type, $options);
-              }
-              $schedule_grid[$day_key][$slot['nid']][$room_nid]['cta'] = $cta;
-              $schedule_grid[$day_key][$slot['nid']][$room_nid]['class'] .= ' available';
-            }
-            // Include availability message.
-            $schedule_grid[$day_key][$slot['nid']][$room_nid]['availability'] = $availability;
-          }
-        }
-      }
-    }
-
-    $vars['days'] = $days;
-  }
-
-  $vars['view_results'] = $view_results;
-  $vars['session_grid'] = $item_grid;
-  $vars['arranged_slots'] = $arranged_slots;
-  $vars['schedule_grid'] = $schedule_grid;
-  $vars['day_links'] = $day_links;
-  $vars['rooms'] = $rooms;
-  $vars['room_nids'] = $room_nids;
-  $vars['show_rooms'] = $show_rooms;
-  $vars['schedule_display'] = $view->cod_schedule_display;
-}
-
-/**
  * Helper function determines days there are time slots for.
  */
 function cod_session_days() {
@@ -1053,104 +583,6 @@ function cod_session_days() {
 }
 
 /**
- * Helper function returns a list of rooms to display on the schedule.
- */
-function _cod_session_schedule_rooms($schedule_view) {
-  // @todo I think Interactive is no longer needed here
-  //$interactive = $schedule_view->cod_schedule_interactive;
-  $rooms = array();
-
-  // Try and load the schedule room list view.
-  $room_view = views_get_view('schedule_room_list');
-  if (!$room_view) {
-    // It didn't load so default to the list of published rooms.
-    $sql = "SELECT node.nid, node.title
-      FROM {node} node WHERE node.type = 'room' AND node.status = 1
-      ORDER BY node.title ASC";
-    $result = db_query($sql);
-    foreach ($result as $record) {
-      $rooms[$record->nid] = array(
-        'title' => check_plain($record->title),
-      );
-    }
-  }
-  else {
-    // Pass along the argument.
-    /* if ($interactive) {
-      $view->set_arguments(array(1));
-    } */
-    $room_queue = $schedule_view->cod_room_queue;
-    if ($room_queue) {
-      $room_view->set_arguments(array($room_queue));
-    }
-    // Return the results from the view.
-    $room_view->execute();
-    foreach ($room_view->result as $record) {
-      // Include the sponsor field. @todo generalize this to View fields.
-      if (isset($record->node_data_field_room_sponsor_field_room_sponsor_nid)) {
-        $sponsor = node_load($record->node_data_field_room_sponsor_field_room_sponsor_nid);
-        $sponsor = l($sponsor->title, 'node/' . $sponsor->nid);
-      }
-      else {
-        $sponsor = '';
-      }
-      $rooms[$record->nid] = array(
-        'title' => check_plain($record->node_title),
-        'sponsor' => $sponsor,
-      );
-    }
-  }
-  return $rooms;
-}
-
-/**
- * Get time slots for a day.
- */
-function cod_session_day_slots($schedule_view, $day) {
-  $time_slots = array();
-
-  // Try and load the cod_time_slots view.
-  // @todo Because Date does not yet provide granularity for date fields in
-  // contextual filters, I've forced it to run the database query.
-  // -- oadaeh 2012-01-21
-  //$view = views_get_view('cod_time_slots');
-  $view = '';
-  if (!$view) {
-    $day = (new DateObject($day, NULL, 'l F, d Y'));
-    $day = date_format_date($day, 'custom', 'Y-m-d');
-    // No view so default to all time slots within this day.
-    $sql = "SELECT n.nid
-      FROM {node} n
-      INNER JOIN {field_data_field_slot_datetime} s ON n.nid = s.entity_id AND n.vid = s.revision_id
-      WHERE n.type = 'time_slot' AND n.status = 1";
-    if ($day) {
-      $sql .= " AND DATE_FORMAT(s.field_slot_datetime_value, '%Y-%m-%d') = :day";
-    }
-    $sql .= " ORDER BY s.field_slot_datetime_value ASC";
-    $result = db_query($sql, array(':day' => $day));
-    foreach ($result as $record) {
-      $time_slots[] = $record;
-    }
-  }
-  else {
-    // If Nodequeue is enabled and a queue has been set for use use that as the
-    // argument for this View, otherwise pass along the day.
-    $time_queue = !empty($schedule_view->cod_time_queue) ? $schedule_view->cod_time_queue : NULL;
-    if ($time_queue) {
-      $view->set_arguments(array($time_queue));
-    }
-    else {
-      $view->set_arguments(array($day));
-    }
-    // There must be a way for this view to respect all the settings of it.
-    $view->items_per_page = 0;
-    $view->execute();
-    $time_slots = $view->result;
-  }
-  return $time_slots;
-}
-
-/**
  * Recursive ksort.
  */
 function cod_session_ksort_recurse(&$array) {
diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc
old mode 100644
new mode 100755
index a07812ff97333d4abbb6432792215be4ff18f9a2..e76c9465f09022fcc67e94e03815b5f9c6138192
--- a/cod_session/cod_session.strongarm.inc
+++ b/cod_session/cod_session.strongarm.inc
@@ -140,7 +140,7 @@ 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 = 0;
+  $strongarm->value = 'COMMENT_NODE_DISABLED';
   $export['comment_page'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -230,6 +230,29 @@ 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 = 'field_bundle_settings_node__room';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+        'path' => array(
+          'weight' => '6',
+        ),
+        'flag' => array(
+          'weight' => '10',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__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 = 'field_bundle_settings_node__schedule_item';
   $strongarm->value = array(
     'view_modes' => array(),
@@ -238,6 +261,9 @@ function cod_session_strongarm() {
         'title' => array(
           'weight' => '-5',
         ),
+        'path' => array(
+          'weight' => '30',
+        ),
       ),
       'display' => array(),
     ),
@@ -255,6 +281,9 @@ function cod_session_strongarm() {
         'title' => array(
           'weight' => '0',
         ),
+        'path' => array(
+          'weight' => '30',
+        ),
       ),
       'display' => array(),
     ),
@@ -264,6 +293,48 @@ 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 = 'field_bundle_settings_node__time_slot';
+  $strongarm->value = array(
+    'view_modes' => array(
+      'teaser' => array(
+        'custom_settings' => TRUE,
+      ),
+      'listing' => array(
+        'custom_settings' => TRUE,
+      ),
+      'full' => array(
+        'custom_settings' => FALSE,
+      ),
+      'rss' => array(
+        'custom_settings' => FALSE,
+      ),
+      'search_index' => array(
+        'custom_settings' => FALSE,
+      ),
+      'search_result' => array(
+        'custom_settings' => FALSE,
+      ),
+      'token' => array(
+        'custom_settings' => FALSE,
+      ),
+    ),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+        'path' => array(
+          'weight' => '2',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__time_slot'] = $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',
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
old mode 100644
new mode 100755
index db4178ca57dce2bf0e8778234a4d14280b6df978..ef7d03d344ef908d857bd1b2632fb489890f86c5
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -10,7 +10,7 @@
 function cod_session_views_default_views() {
   $export = array();
 
-  $view = new view;
+  $view = new view();
   $view->name = 'cod_schedule';
   $view->description = 'Session Schedule';
   $view->tag = 'cod session';
@@ -23,6 +23,7 @@ function cod_session_views_default_views() {
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Schedule (Access Restricted)';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'role';
   $handler->display->display_options['access']['role'] = array(
     4 => '4',
@@ -49,119 +50,47 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
   $handler->display->display_options['empty']['area']['label'] = 'The schedule is empty';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'Please create one or more rooms and time slots, and assign a session or schedule item to them. For help with scheduling, please see the <a href="http://drupal.org/documentation/build/cod/">COD Documentation</a>.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
-  /* Relationship: Entity Reference: Referenced Entity */
+  /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
   $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
   $handler->display->display_options['relationships']['field_session_slot_target_id']['label'] = 'Time slot';
-  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1;
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = TRUE;
   /* 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']['alter_text'] = 1;
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['title']['alter']['text'] = '<strong>[title]</strong>';
-  $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']['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;
   /* Field: Content: Speaker(s) */
   $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
   $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
   $handler->display->display_options['fields']['field_speakers']['label'] = '';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_speakers']['settings'] = array(
     'link' => 0,
   );
-  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
   $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['delta_first_last'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
   /* Field: Content: Track */
   $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
   $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
   $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
   $handler->display->display_options['fields']['field_track']['label'] = '';
-  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_track']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
   /* Field: Content: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
   $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['label'] = '';
-  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_experience']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 1;
-  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_experience']['hide_empty'] = TRUE;
   /* Field: Content: Date and time */
   $handler->display->display_options['fields']['field_slot_datetime']['id'] = 'field_slot_datetime';
   $handler->display->display_options['fields']['field_slot_datetime']['table'] = 'field_data_field_slot_datetime';
@@ -169,24 +98,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['field_slot_datetime']['relationship'] = 'field_session_slot_target_id';
   $handler->display->display_options['fields']['field_slot_datetime']['label'] = '';
   $handler->display->display_options['fields']['field_slot_datetime']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_slot_datetime']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_slot_datetime']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_slot_datetime']['settings'] = array(
     'format_type' => 'date_no_time_',
     'fromto' => 'value',
@@ -194,31 +106,13 @@ function cod_session_views_default_views() {
     'multiple_from' => '',
     'multiple_to' => '',
   );
-  $handler->display->display_options['fields']['field_slot_datetime']['field_api_classes'] = 0;
   /* Field: Content: Date and time */
   $handler->display->display_options['fields']['field_slot_datetime_1']['id'] = 'field_slot_datetime_1';
   $handler->display->display_options['fields']['field_slot_datetime_1']['table'] = 'field_data_field_slot_datetime';
   $handler->display->display_options['fields']['field_slot_datetime_1']['field'] = 'field_slot_datetime';
   $handler->display->display_options['fields']['field_slot_datetime_1']['relationship'] = 'field_session_slot_target_id';
   $handler->display->display_options['fields']['field_slot_datetime_1']['label'] = '';
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_slot_datetime_1']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_slot_datetime_1']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_slot_datetime_1']['settings'] = array(
     'format_type' => 'long',
     'fromto' => 'both',
@@ -226,7 +120,6 @@ function cod_session_views_default_views() {
     'multiple_from' => '',
     'multiple_to' => '',
   );
-  $handler->display->display_options['fields']['field_slot_datetime_1']['field_api_classes'] = 0;
   /* Sort criterion: Content: Date and time (field_slot_datetime) */
   $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value';
   $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
@@ -260,12 +153,12 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_target_id']['id'] = 'field_session_room_target_id';
   $handler->display->display_options['filters']['field_session_room_target_id']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_target_id']['field'] = 'field_session_room_target_id';
   $handler->display->display_options['filters']['field_session_room_target_id']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
   $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
@@ -273,12 +166,13 @@ function cod_session_views_default_views() {
 
   /* Display: Schedule */
   $handler = $view->new_display('page', 'Schedule', 'page_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Entity Reference: Referenced Entity */
+  /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
   $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
-  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1;
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = TRUE;
   $handler->display->display_options['path'] = 'program/session-schedule/%';
   $handler->display->display_options['menu']['title'] = 'Session Schedule';
   $handler->display->display_options['menu']['weight'] = '-50';
@@ -291,34 +185,39 @@ function cod_session_views_default_views() {
 
   /* Display: Primary Sessions Block */
   $handler = $view->new_display('block', 'Primary Sessions Block', 'block_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['block_description'] = 'Primary Sessions';
 
   /* Display: Your schedule */
   $handler = $view->new_display('page', 'Your schedule', 'page_2');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Your schedule';
+  $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'] = 'Your schedule is empty';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'You can add sessions to your personal schedule from the <a href="/program/session-schedule">main schedule.</a>';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id';
   $handler->display->display_options['relationships']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers';
   $handler->display->display_options['relationships']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id';
-  $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = 1;
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = TRUE;
   /* Relationship: Flags: session_schedule */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
   $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_schedule';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'AND',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -344,12 +243,12 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_target_id']['id'] = 'field_session_room_target_id';
   $handler->display->display_options['filters']['field_session_room_target_id']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_target_id']['field'] = 'field_session_room_target_id';
   $handler->display->display_options['filters']['field_session_room_target_id']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
   $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
@@ -370,6 +269,7 @@ function cod_session_views_default_views() {
 
   /* Display: Session schedule */
   $handler = $view->new_display('page', 'Session schedule', 'page_3');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'program/session-schedule';
   $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'Session schedule';
@@ -379,7 +279,91 @@ function cod_session_views_default_views() {
   $handler->display->display_options['menu']['context'] = 0;
   $export['cod_schedule'] = $view;
 
-  $view = new view;
+  $view = new view();
+  $view->name = 'cod_session_timeslot';
+  $view->description = 'View representing the select field for timeslot entity references in sessions, bofs, etc';
+  $view->tag = 'default';
+  $view->base_table = 'field_collection_item';
+  $view->human_name = 'cod_session_timeslot';
+  $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['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'none';
+  $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['style_plugin'] = 'default';
+  $handler->display->display_options['row_plugin'] = 'fields';
+  /* Relationship: Field collection item: Entity with the Allowed Slot Types (field_room_slots_types_allowed) */
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['id'] = 'field_room_slots_types_allowed_node';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['table'] = 'field_collection_item';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['field'] = 'field_room_slots_types_allowed_node';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['required'] = TRUE;
+  /* Field: Field collection item: Field collection item ID */
+  $handler->display->display_options['fields']['item_id']['id'] = 'item_id';
+  $handler->display->display_options['fields']['item_id']['table'] = 'field_collection_item';
+  $handler->display->display_options['fields']['item_id']['field'] = 'item_id';
+  $handler->display->display_options['fields']['item_id']['label'] = '';
+  $handler->display->display_options['fields']['item_id']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['item_id']['element_label_colon'] = FALSE;
+  /* 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']['relationship'] = 'field_room_slots_types_allowed_node';
+  $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: Field collection item: Time Slot */
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['id'] = 'field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['table'] = 'field_data_field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['field'] = 'field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['label'] = '';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['settings'] = array(
+    'link' => 0,
+  );
+  /* Contextual filter: Field collection item: Allowed Schedule Types (field_slot_types_allowed) */
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['id'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['table'] = 'field_data_field_slot_types_allowed';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['field'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_action'] = 'default';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_argument_type'] = 'raw';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_argument_options']['index'] = '2';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['specify_validation'] = TRUE;
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['validate']['type'] = 'php';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['validate_options']['code'] = '$handler->argument = str_replace(\'-\',\'_\',$handler->argument);
+return TRUE;';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['limit'] = '0';
+
+  /* Display: Entity Reference */
+  $handler = $view->new_display('entityreference', 'Entity Reference', 'entityreference_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $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['defaults']['style_plugin'] = FALSE;
+  $handler->display->display_options['style_plugin'] = 'entityreference_style';
+  $handler->display->display_options['style_options']['search_fields'] = array(
+    'field_slot_types_time_slot' => 'field_slot_types_time_slot',
+    'title' => 'title',
+    'item_id' => 0,
+  );
+  $handler->display->display_options['defaults']['style_options'] = FALSE;
+  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+  $handler->display->display_options['row_plugin'] = 'entityreference_fields';
+  $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $export['cod_session_timeslot'] = $view;
+
+  $view = new view();
   $view->name = 'cod_time_slots';
   $view->description = 'List of time slots for COD schedules';
   $view->tag = 'cod session';
@@ -387,10 +371,11 @@ function cod_session_views_default_views() {
   $view->human_name = '';
   $view->core = 7;
   $view->api_version = '3.0';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = TRUE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
+  $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';
@@ -406,17 +391,8 @@ function cod_session_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']['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']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 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;
   /* Sort criterion: Content: Date and time (field_slot_datetime) */
   $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value';
   $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
@@ -426,11 +402,10 @@ function cod_session_views_default_views() {
   $handler->display->display_options['arguments']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
   $handler->display->display_options['arguments']['field_slot_datetime_value']['field'] = 'field_slot_datetime_value';
   $handler->display->display_options['arguments']['field_slot_datetime_value']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['field_slot_datetime_value']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['field_slot_datetime_value']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['field_slot_datetime_value']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['field_slot_datetime_value']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_slot_datetime_value']['specify_validation'] = 1;
+  $handler->display->display_options['arguments']['field_slot_datetime_value']['specify_validation'] = TRUE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -447,7 +422,7 @@ function cod_session_views_default_views() {
   );
   $export['cod_time_slots'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'schedule_room_list';
   $view->description = 'List of rooms for COD schedules';
   $view->tag = 'cod session';
@@ -455,10 +430,11 @@ function cod_session_views_default_views() {
   $view->human_name = '';
   $view->core = 0;
   $view->api_version = '3.0';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = TRUE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Defaults */
   $handler = $view->new_display('default', 'Defaults', 'default');
+  $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';
@@ -472,38 +448,12 @@ function cod_session_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']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
-  $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']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 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']['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']['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'] = 0;
-  $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;
+  $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -526,7 +476,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['operator'] = FALSE;
   $export['schedule_room_list'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions';
   $view->description = '';
   $view->tag = 'default';
@@ -539,6 +489,7 @@ function cod_session_views_default_views() {
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Proposed Sessions';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['link_display'] = 'page_1';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -549,7 +500,6 @@ function cod_session_views_default_views() {
   $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']['grouping'] = '';
   $handler->display->display_options['style_options']['columns'] = array(
@@ -603,18 +553,14 @@ function cod_session_views_default_views() {
       'empty_column' => 0,
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 1;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
+  $handler->display->display_options['style_options']['sticky'] = TRUE;
   /* 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'] = 'No sessions have been submitted.';
   $handler->display->display_options['empty']['area']['format'] = 'plain_text';
-  $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';
@@ -624,140 +570,47 @@ function cod_session_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'] = 'Session';
-  $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: Speaker(s) */
   $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
   $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = FALSE;
   /* Field: Content: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
   $handler->display->display_options['fields']['body']['field'] = 'body';
   $handler->display->display_options['fields']['body']['label'] = '';
-  $handler->display->display_options['fields']['body']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['nl2br'] = 0;
   $handler->display->display_options['fields']['body']['alter']['max_length'] = '200';
-  $handler->display->display_options['fields']['body']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['body']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['body']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['trim'] = 1;
-  $handler->display->display_options['fields']['body']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim'] = TRUE;
   $handler->display->display_options['fields']['body']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['body']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['body']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['body']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['body']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['body']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
   $handler->display->display_options['fields']['body']['settings'] = array(
     'trim_length' => '250',
   );
-  $handler->display->display_options['fields']['body']['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']['exclude'] = TRUE;
-  $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;
   /* Field: Content: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
   $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
-  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = FALSE;
   /* Field: Content: Track */
   $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
   $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
   $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
-  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = FALSE;
   /* Contextual filter: Content: Nid */
   $handler->display->display_options['arguments']['nid']['id'] = 'nid';
   $handler->display->display_options['arguments']['nid']['table'] = 'node';
@@ -787,7 +640,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience';
   $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
   $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'field_experience_value';
-  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
   /* Filter criterion: Content: Track (field_track) */
   $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
   $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
@@ -797,7 +649,6 @@ function cod_session_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'] = 'field_track_value';
-  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
   /* Filter criterion: Search: Search Terms */
   $handler->display->display_options['filters']['keys']['id'] = 'keys';
   $handler->display->display_options['filters']['keys']['table'] = 'search_index';
@@ -807,7 +658,6 @@ function cod_session_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: Status (field_accepted) */
   $handler->display->display_options['filters']['field_accepted_value']['id'] = 'field_accepted_value';
   $handler->display->display_options['filters']['field_accepted_value']['table'] = 'field_data_field_accepted';
@@ -818,6 +668,8 @@ function cod_session_views_default_views() {
 
   /* Display: Page: Proposed */
   $handler = $view->new_display('page', 'Page: Proposed', 'page_proposed');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -844,7 +696,6 @@ function cod_session_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'] = 'field_experience_value';
-  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
   /* Filter criterion: Content: Track (field_track) */
   $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
   $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
@@ -855,7 +706,6 @@ function cod_session_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'] = 'field_track_value';
-  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
   /* Filter criterion: Search: Search Terms */
   $handler->display->display_options['filters']['keys']['id'] = 'keys';
   $handler->display->display_options['filters']['keys']['table'] = 'search_index';
@@ -866,7 +716,6 @@ function cod_session_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: Status (field_accepted) */
   $handler->display->display_options['filters']['field_accepted_value_1']['id'] = 'field_accepted_value_1';
   $handler->display->display_options['filters']['field_accepted_value_1']['table'] = 'field_data_field_accepted';
@@ -885,6 +734,7 @@ function cod_session_views_default_views() {
   $handler = $view->new_display('page', 'Page: Accepted', 'page_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Accepted Sessions';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
@@ -932,9 +782,7 @@ function cod_session_views_default_views() {
       'separator' => '',
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 1;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
+  $handler->display->display_options['style_options']['sticky'] = TRUE;
   $handler->display->display_options['defaults']['style_options'] = FALSE;
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
@@ -944,10 +792,8 @@ function cod_session_views_default_views() {
   $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'] = 'No sessions have been accepted yet.';
   $handler->display->display_options['empty']['area']['format'] = 'plain_text';
-  $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';
@@ -966,15 +812,16 @@ function cod_session_views_default_views() {
 
   /* Display: Feed: All */
   $handler = $view->new_display('feed', 'Feed: All', 'feed_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['link_display'] = FALSE;
   $handler->display->display_options['link_display'] = 'page_proposed';
   $handler->display->display_options['pager']['type'] = 'some';
   $handler->display->display_options['style_plugin'] = 'rss';
   $handler->display->display_options['row_plugin'] = 'node_rss';
   $handler->display->display_options['row_options']['item_length'] = 'full';
-  $handler->display->display_options['row_options']['links'] = 0;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -999,7 +846,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience';
   $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
   $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'field_experience_value';
-  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
   /* Filter criterion: Content: Track (field_track) */
   $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
   $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
@@ -1009,7 +855,6 @@ function cod_session_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'] = 'field_track_value';
-  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
   /* Filter criterion: Search: Search Terms */
   $handler->display->display_options['filters']['keys']['id'] = 'keys';
   $handler->display->display_options['filters']['keys']['table'] = 'search_index';
@@ -1019,7 +864,6 @@ function cod_session_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;
   $handler->display->display_options['path'] = 'program/sessions/proposed/rss';
   $handler->display->display_options['displays'] = array(
     'page_1' => 'page_1',
@@ -1033,113 +877,40 @@ function cod_session_views_default_views() {
   $handler->display->display_options['title'] = 'Sessions Details';
   $handler->display->display_options['defaults']['css_class'] = FALSE;
   $handler->display->display_options['css_class'] = 'session-details';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '1';
   $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['defaults']['relationships'] = FALSE;
-  /* Relationship: Broken/missing handler */
-  $handler->display->display_options['relationships']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['required'] = 0;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* 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'] = 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'] = 0;
-  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = FALSE;
   /* 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'] = 'Session';
-  $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: Track */
   $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
   $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
   $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
-  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
-  /* Field: Content: Room */
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = FALSE;
+  /* Field: Broken/missing handler */
   $handler->display->display_options['fields']['field_session_room']['id'] = 'field_session_room';
   $handler->display->display_options['fields']['field_session_room']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['fields']['field_session_room']['field'] = 'field_session_room';
   $handler->display->display_options['fields']['field_session_room']['label'] = 'Room (field_session_room) - delta';
-  $handler->display->display_options['fields']['field_session_room']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_session_room']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_session_room']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_session_room']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_session_room']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_session_room']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_session_room']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['delta_first_last'] = 0;
-  $handler->display->display_options['fields']['field_session_room']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_session_room']['element_label_colon'] = FALSE;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Content: Nid */
   $handler->display->display_options['arguments']['nid']['id'] = 'nid';
@@ -1147,13 +918,10 @@ function cod_session_views_default_views() {
   $handler->display->display_options['arguments']['nid']['field'] = 'nid';
   $handler->display->display_options['arguments']['nid']['default_action'] = 'default';
   $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'node';
-  $handler->display->display_options['arguments']['nid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['nid']['specify_validation'] = 1;
-  $handler->display->display_options['arguments']['nid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['nid']['not'] = 0;
+  $handler->display->display_options['arguments']['nid']['specify_validation'] = TRUE;
 
   /* Display: Block: Speakers */
   $handler = $view->new_display('block', 'Block: Speakers', 'block_2');
@@ -1161,6 +929,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['title'] = 'Speakers';
   $handler->display->display_options['defaults']['css_class'] = FALSE;
   $handler->display->display_options['css_class'] = 'session-speakers';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['pager']['options']['offset'] = '0';
@@ -1168,129 +937,49 @@ function cod_session_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'grid';
   $handler->display->display_options['style_options']['grouping'] = '';
   $handler->display->display_options['style_options']['columns'] = '1';
-  $handler->display->display_options['style_options']['fill_single_line'] = 1;
   $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['row_options']['inline'] = array(
     'field_speakers' => 'field_speakers',
   );
-  $handler->display->display_options['row_options']['hide_empty'] = 0;
-  $handler->display->display_options['row_options']['default_field_elements'] = 1;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Broken/missing handler */
-  $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 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['defaults']['fields'] = FALSE;
   /* Field: User: Picture */
   $handler->display->display_options['fields']['picture']['id'] = 'picture';
   $handler->display->display_options['fields']['picture']['table'] = 'users';
   $handler->display->display_options['fields']['picture']['field'] = 'picture';
-  $handler->display->display_options['fields']['picture']['relationship'] = 'field_speakers_uid';
+  $handler->display->display_options['fields']['picture']['relationship'] = 'uid';
   $handler->display->display_options['fields']['picture']['label'] = '';
-  $handler->display->display_options['fields']['picture']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['picture']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['picture']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['picture']['alter']['html'] = 0;
   $handler->display->display_options['fields']['picture']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['picture']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['picture']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['picture']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['picture']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['picture']['link_photo_to_profile'] = 0;
+  $handler->display->display_options['fields']['picture']['link_photo_to_profile'] = FALSE;
   /* Field: User: Name */
   $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
   $handler->display->display_options['fields']['name_1']['table'] = 'users';
   $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_speakers_uid';
+  $handler->display->display_options['fields']['name_1']['relationship'] = 'uid';
   $handler->display->display_options['fields']['name_1']['label'] = '';
-  $handler->display->display_options['fields']['name_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['name_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['name_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name_1']['alter']['html'] = 0;
   $handler->display->display_options['fields']['name_1']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['name_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['name_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name_1']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = 1;
-  $handler->display->display_options['fields']['name_1']['overwrite_anonymous'] = 0;
-  $handler->display->display_options['fields']['name_1']['format_username'] = 1;
   /* 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'] = 'field_speakers_uid';
+  $handler->display->display_options['fields']['name']['relationship'] = 'uid';
   $handler->display->display_options['fields']['name']['label'] = '';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['name']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['name']['alter']['text'] = '([name_1])';
-  $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']['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'] = FALSE;
-  $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: User: Organization */
-  $handler->display->display_options['fields']['field_profile_org']['id'] = 'field_profile_org';
-  $handler->display->display_options['fields']['field_profile_org']['table'] = 'field_data_field_profile_org';
-  $handler->display->display_options['fields']['field_profile_org']['field'] = 'field_profile_org';
-  $handler->display->display_options['fields']['field_profile_org']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['field_profile_org']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['make_link'] = 1;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['path'] = 'organization/[value]';
-  $handler->display->display_options['fields']['field_profile_org']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_profile_org']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_profile_org']['hide_alter_empty'] = 1;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   /* Sort criterion: User: Name */
   $handler->display->display_options['sorts']['name']['id'] = 'name';
   $handler->display->display_options['sorts']['name']['table'] = 'users';
   $handler->display->display_options['sorts']['name']['field'] = 'name';
-  $handler->display->display_options['sorts']['name']['relationship'] = 'field_speakers_uid';
+  $handler->display->display_options['sorts']['name']['relationship'] = 'uid';
   $handler->display->display_options['sorts']['name']['order'] = 'DESC';
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Content: Nid */
@@ -1299,13 +988,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['arguments']['nid']['field'] = 'nid';
   $handler->display->display_options['arguments']['nid']['default_action'] = 'default';
   $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'node';
-  $handler->display->display_options['arguments']['nid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['nid']['specify_validation'] = 1;
-  $handler->display->display_options['arguments']['nid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['nid']['not'] = 0;
+  $handler->display->display_options['arguments']['nid']['specify_validation'] = TRUE;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -1331,9 +1018,72 @@ function cod_session_views_default_views() {
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
   $handler->display->display_options['block_description'] = 'Sessions: Speakers';
+
+  /* Display: Block: Schedule Item Listing */
+  $handler = $view->new_display('block', 'Block: Schedule Item Listing', 'block_3');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Schedule Items';
+  $handler->display->display_options['display_description'] = 'These are Item listings generated from timeslots';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'none';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $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;
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_session_timeslot_target_id']['id'] = 'field_session_timeslot_target_id';
+  $handler->display->display_options['relationships']['field_session_timeslot_target_id']['table'] = 'field_data_field_session_timeslot';
+  $handler->display->display_options['relationships']['field_session_timeslot_target_id']['field'] = 'field_session_timeslot_target_id';
+  $handler->display->display_options['relationships']['field_session_timeslot_target_id']['required'] = TRUE;
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* 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;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
+  $handler->display->display_options['defaults']['arguments'] = FALSE;
+  /* Contextual filter: Content: Session Time Slot(s) (field_session_timeslot) */
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['id'] = 'field_session_timeslot_target_id';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['table'] = 'field_data_field_session_timeslot';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['field'] = 'field_session_timeslot_target_id';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_session_timeslot_target_id']['summary_options']['items_per_page'] = '25';
+  /* Contextual filter: Field collection item: Allowed Schedule Types (field_slot_types_allowed) */
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['id'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['table'] = 'field_data_field_slot_types_allowed';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['field'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['relationship'] = 'field_session_timeslot_target_id';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['limit'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['break_phrase'] = TRUE;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* 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;
   $export['sessions'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions_admin';
   $view->description = '';
   $view->tag = 'default';
@@ -1347,6 +1097,7 @@ function cod_session_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'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'edit field_accepted';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -1354,13 +1105,10 @@ function cod_session_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',
@@ -1405,149 +1153,52 @@ function cod_session_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;
   /* 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: 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;
   /* Field: Content: Speaker(s) */
   $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
   $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = FALSE;
   /* Field: Content: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
   $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
-  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = FALSE;
   /* Field: Content: Track */
   $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
   $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
   $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
-  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
-  /* Field: Node: Edit link */
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = FALSE;
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['label'] = '';
-  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
   $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -1578,8 +1229,7 @@ function cod_session_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';
@@ -1590,7 +1240,6 @@ function cod_session_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';
@@ -1601,9 +1250,8 @@ function cod_session_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: Accepted */
   $handler = $view->new_display('page', 'Page: Accepted', 'page_1');
@@ -1611,21 +1259,25 @@ function cod_session_views_default_views() {
   $handler->display->display_options['title'] = 'Accepted 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['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'AND',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -1665,8 +1317,7 @@ function cod_session_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';
@@ -1677,7 +1328,6 @@ function cod_session_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';
@@ -1688,9 +1338,8 @@ function cod_session_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;
   $handler->display->display_options['path'] = 'conference-admin/sessions/accepted';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Accepted Sessions';
@@ -1706,17 +1355,21 @@ function cod_session_views_default_views() {
   $handler->display->display_options['title'] = 'Declined Sessions';
   $handler->display->display_options['defaults']['css_class'] = FALSE;
   $handler->display->display_options['css_class'] = 'view-grouped-list sessions-list sessions-declined';
+  $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 declined sessions';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'No sessions have been declined yet. When you decline 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;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'AND',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -1744,8 +1397,7 @@ function cod_session_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';
@@ -1756,7 +1408,6 @@ function cod_session_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';
@@ -1767,9 +1418,8 @@ function cod_session_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;
   $handler->display->display_options['path'] = 'conference-admin/sessions/declined';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Declined Sessions';
@@ -1783,16 +1433,20 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['css_class'] = FALSE;
   $handler->display->display_options['css_class'] = 'view-grouped-list sessions-list sessions-unprocessed';
   $handler->display->display_options['display_description'] = 'These sessions have not yet been approved or declined. ';
+  $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 unprocessed sessions';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no sessions to process. Relax a bit!';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'AND',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -1820,8 +1474,7 @@ function cod_session_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';
@@ -1832,7 +1485,6 @@ function cod_session_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';
@@ -1843,9 +1495,8 @@ function cod_session_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;
   $handler->display->display_options['path'] = 'conference-admin/sessions/unprocessed';
   $handler->display->display_options['menu']['type'] = 'default tab';
   $handler->display->display_options['menu']['title'] = 'Unprocessed sessions';
@@ -1859,16 +1510,20 @@ function cod_session_views_default_views() {
   $handler = $view->new_display('page', 'Page: Scheduled', 'page_4');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Scheduled Sessions';
+  $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 scheduled sessions';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'No sessions have been scheduled yet. Assign a time slot and room to an accepted session to schedule it.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'AND',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -1910,8 +1565,7 @@ function cod_session_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';
@@ -1922,7 +1576,6 @@ function cod_session_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';
@@ -1933,9 +1586,8 @@ function cod_session_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;
   $handler->display->display_options['path'] = 'conference-admin/sessions/scheduled';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Scheduled sessions';
@@ -1943,7 +1595,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['menu']['name'] = 'menu-menu-conference-admin';
   $export['sessions_admin'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions_admin_contact';
   $view->description = 'Allows conference administrators to mass email various groups of speakers.';
   $view->tag = 'cod session';
@@ -1957,6 +1609,7 @@ function cod_session_views_default_views() {
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'General speaker mail';
   $handler->display->display_options['css_class'] = 'view-grouped-list sessions-list';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['link_display'] = 'page_3';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'edit field_accepted';
@@ -1968,7 +1621,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['pager']['options']['items_per_page'] = '130';
   $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']['grouping'] = '';
   $handler->display->display_options['style_options']['columns'] = array(
@@ -2042,53 +1694,36 @@ function cod_session_views_default_views() {
       'empty_column' => 0,
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 1;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
+  $handler->display->display_options['style_options']['sticky'] = TRUE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
-  $handler->display->display_options['header']['area']['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 speakers...';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no speakers in this category.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = TRUE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Select';
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['views_bulk_operations']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['entity_load_capacity'] = '10';
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['operations'] = array(
+  $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = FALSE;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '1';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_result'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
     'action::node_assign_owner_action' => array(
       'selected' => 0,
       'use_queue' => 0,
@@ -2187,191 +1822,62 @@ function cod_session_views_default_views() {
       'label' => '',
     ),
   );
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '1';
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 1;
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['merge_single_action'] = 0;
-  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['force_single'] = 0;
   /* Field: Global: View result counter */
   $handler->display->display_options['fields']['counter']['id'] = 'counter';
   $handler->display->display_options['fields']['counter']['table'] = 'views';
   $handler->display->display_options['fields']['counter']['field'] = 'counter';
   $handler->display->display_options['fields']['counter']['label'] = 'Row #';
-  $handler->display->display_options['fields']['counter']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['counter']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['counter']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['counter']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['counter']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['counter']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['counter']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['counter']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['counter']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['counter']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['counter']['counter_start'] = '1';
   /* 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'] = 'ID';
-  $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']['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'] = 0;
-  $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'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* 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'] = 1;
-  $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']['hide_alter_empty'] = FALSE;
   /* Field: User: First name */
   $handler->display->display_options['fields']['field_profile_first']['id'] = 'field_profile_first';
   $handler->display->display_options['fields']['field_profile_first']['table'] = 'field_data_field_profile_first';
   $handler->display->display_options['fields']['field_profile_first']['field'] = 'field_profile_first';
   $handler->display->display_options['fields']['field_profile_first']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['field_profile_first']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_profile_first']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_profile_first']['hide_alter_empty'] = FALSE;
   /* Field: User: Last name */
   $handler->display->display_options['fields']['field_profile_last']['id'] = 'field_profile_last';
   $handler->display->display_options['fields']['field_profile_last']['table'] = 'field_data_field_profile_last';
   $handler->display->display_options['fields']['field_profile_last']['field'] = 'field_profile_last';
   $handler->display->display_options['fields']['field_profile_last']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['field_profile_last']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_profile_last']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_profile_last']['hide_alter_empty'] = FALSE;
   /* 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'] = 'field_speakers_uid';
   $handler->display->display_options['fields']['name']['label'] = 'Username';
-  $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']['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'] = 0;
-  $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'] = 0;
-  $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']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['name']['hide_alter_empty'] = FALSE;
   /* Field: User: E-mail */
   $handler->display->display_options['fields']['mail']['id'] = 'mail';
   $handler->display->display_options['fields']['mail']['table'] = 'users';
   $handler->display->display_options['fields']['mail']['field'] = 'mail';
   $handler->display->display_options['fields']['mail']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['mail']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['mail']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['mail']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['mail']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['mail']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['mail']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['mail']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['mail']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['mail']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['mail']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['mail']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['mail']['link_to_user'] = 0;
   /* Field: Content: Speaker(s) */
   $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
   $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -2401,6 +1907,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers of unprocessed sessions';
   $handler->display->display_options['display_description'] = 'Email speakers of unprocessed sessions';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
@@ -2410,17 +1917,15 @@ function cod_session_views_default_views() {
   $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = 'Each speaker will receive one email per unprocessed session submission.';
   $handler->display->display_options['header']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $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 unprocessed speakers';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no unprocessed speakers at the moment. ';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2460,6 +1965,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers of declined sessions';
   $handler->display->display_options['display_description'] = 'Email speakers of declined sessions';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
@@ -2469,17 +1975,15 @@ function cod_session_views_default_views() {
   $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = 'Each speaker will receive one email per declined session submission.';
   $handler->display->display_options['header']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $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 declined speakers';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no declined speakers at the moment.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2513,6 +2017,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers of accepted sessions';
   $handler->display->display_options['display_description'] = 'Email speakers of accepted sessions';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
@@ -2522,17 +2027,15 @@ function cod_session_views_default_views() {
   $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = 'Each speaker will receive one email per accepted session submission. Note: Only sessions that have not yet been scheduled are displayed here.';
   $handler->display->display_options['header']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $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 speakers';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no accepted speakers at the moment. Try <a href="/conference-admin/sessions">reviewing sessions</a> to accept or decline them.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2571,6 +2074,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers of scheduled sessions';
   $handler->display->display_options['display_description'] = 'Email speakers of scheduled sessions';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
@@ -2580,17 +2084,15 @@ function cod_session_views_default_views() {
   $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = 'Each speaker will receive one email per scheduled session.';
   $handler->display->display_options['header']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $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 speakers...';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no scheduled speakers at the moment.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2634,29 +2136,29 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers who have not confirmed their scheduled session';
   $handler->display->display_options['display_description'] = 'Email speakers who have not confirmed their scheduled session';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
   $handler->display->display_options['header']['area']['label'] = 'Unconfirmed speakers';
-  $handler->display->display_options['header']['area']['empty'] = FALSE;
   $handler->display->display_options['header']['area']['content'] = '<p class="speakers-unconfirmed-header">These sessions have been accepted and scheduled, but the speakers haven\'t confirmed.</p>';
   $handler->display->display_options['header']['area']['format'] = 'full_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = TRUE;
   /* Relationship: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm';
   $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2707,38 +2209,36 @@ function cod_session_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Email speakers who have confirmed for their session';
   $handler->display->display_options['display_description'] = 'Email speakers who have confirmed for their session';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
   $handler->display->display_options['header']['area']['label'] = 'Confirmed speakers';
-  $handler->display->display_options['header']['area']['empty'] = FALSE;
   $handler->display->display_options['header']['area']['content'] = '<p class="speakers-confirmed-header">Speakers listed here have confirmed that they are able to present at the scheduled date and time.</p>';
   $handler->display->display_options['header']['area']['format'] = 'full_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $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 confirmed speakers';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no confirmed session speakers yet.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = TRUE;
   /* Relationship: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2781,7 +2281,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['menu']['name'] = 'menu-menu-conference-admin';
   $export['sessions_admin_contact'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'sessions_speaker_confirmation';
   $view->description = 'Your sessions';
   $view->tag = 'cod session';
@@ -2794,6 +2294,7 @@ function cod_session_views_default_views() {
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Speaker confirmation';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'none';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
@@ -2831,9 +2332,6 @@ function cod_session_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: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
@@ -2844,78 +2342,35 @@ function cod_session_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']['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']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Content: Time slot */
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+  /* Field: Broken/missing handler */
   $handler->display->display_options['fields']['field_session_slot']['id'] = 'field_session_slot';
   $handler->display->display_options['fields']['field_session_slot']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['fields']['field_session_slot']['field'] = 'field_session_slot';
   $handler->display->display_options['fields']['field_session_slot']['label'] = 'Session date & time';
-  $handler->display->display_options['fields']['field_session_slot']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_session_slot']['element_label_colon'] = FALSE;
   /* Field: Flags: Flag link */
   $handler->display->display_options['fields']['ops']['id'] = 'ops';
   $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
   $handler->display->display_options['fields']['ops']['field'] = 'ops';
   $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['fields']['ops']['label'] = 'Confirmation';
-  $handler->display->display_options['fields']['ops']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['ops']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['ops']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['ops']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['ops']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['ops']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['ops']['empty'] = 'Confirmed';
-  $handler->display->display_options['fields']['ops']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['ops']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['ops']['hide_alter_empty'] = FALSE;
   /* Contextual filter: Broken/missing handler */
   $handler->display->display_options['arguments']['field_speakers_uid']['id'] = 'field_speakers_uid';
   $handler->display->display_options['arguments']['field_speakers_uid']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['arguments']['field_speakers_uid']['field'] = 'field_speakers_uid';
   $handler->display->display_options['arguments']['field_speakers_uid']['default_action'] = 'default';
   $handler->display->display_options['arguments']['field_speakers_uid']['default_argument_type'] = 'current_user';
-  $handler->display->display_options['arguments']['field_speakers_uid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['field_speakers_uid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['field_speakers_uid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['field_speakers_uid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_speakers_uid']['specify_validation'] = 1;
+  $handler->display->display_options['arguments']['field_speakers_uid']['specify_validation'] = TRUE;
   $handler->display->display_options['arguments']['field_speakers_uid']['validate']['type'] = 'user';
   $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['type'] = 'either';
-  $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['restrict_roles'] = 0;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -2943,7 +2398,212 @@ function cod_session_views_default_views() {
 
   /* Display: Content pane */
   $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $export['sessions_speaker_confirmation'] = $view;
 
+  $view = new view();
+  $view->name = 'cod_session_schedule';
+  $view->description = 'Conference Organizing Scheduler Admin View';
+  $view->tag = 'default';
+  $view->base_table = 'node';
+  $view->human_name = 'cod_session_schedule';
+  $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'] = 'Sessions';
+  $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['query']['options']['query_comment'] = FALSE;
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'none';
+  $handler->display->display_options['style_plugin'] = 'quicktabs';
+  $handler->display->display_options['style_options']['grouping'] = array(
+    0 => array(
+      'field' => 'field_slot_datetime',
+      'rendered' => 1,
+      'rendered_strip' => 1,
+    ),
+  );
+  $handler->display->display_options['style_options']['tab_style'] = 'Basic';
+  $handler->display->display_options['style_options']['tab_title_field'] = 'field_slot_datetime';
+  $handler->display->display_options['row_plugin'] = 'fields';
+  /* Field: Content: Date and time */
+  $handler->display->display_options['fields']['field_slot_datetime']['id'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['field'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['label'] = '';
+  $handler->display->display_options['fields']['field_slot_datetime']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_slot_datetime']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_slot_datetime']['settings'] = array(
+    'format_type' => 'date_no_time_',
+    'fromto' => 'value',
+    'multiple_number' => '',
+    'multiple_from' => '',
+    'multiple_to' => '',
+  );
+  /* 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']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 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']['element_label_colon'] = FALSE;
+  /* 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';
+  $handler->display->display_options['fields']['view']['label'] = '';
+  $handler->display->display_options['fields']['view']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['view']['hide_empty'] = TRUE;
+  $handler->display->display_options['fields']['view']['view'] = 'cod_session_schedule_entity';
+  $handler->display->display_options['fields']['view']['display'] = 'block';
+  $handler->display->display_options['fields']['view']['arguments'] = '[!nid]/session+schedule_item';
+  /* Sort criterion: Content: Date and time (field_slot_datetime) */
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['field'] = 'field_slot_datetime_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;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'time_slot' => 'time_slot',
+  );
+  $handler->display->display_options['filters']['type']['group'] = 1;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['path'] = 'program/schedule/sessions';
+
+  $export['cod_session_schedule'] = $view;
+
+  $view = new view();
+  $view->name = 'cod_session_schedule_entity';
+  $view->description = 'The scheduling entity that renders Timeslot Combos';
+  $view->tag = 'default';
+  $view->base_table = 'field_collection_item';
+  $view->human_name = 'cod_session_schedule_entity';
+  $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'] = 'cod_session_schedule_entity';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'none';
+  $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'] = 'some';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '5';
+  $handler->display->display_options['style_plugin'] = 'default';
+  $handler->display->display_options['row_plugin'] = 'fields';
+  /* Relationship: Field collection item: Entity with the Allowed Slot Types (field_room_slots_types_allowed) */
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['id'] = 'field_room_slots_types_allowed_node';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['table'] = 'field_collection_item';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['field'] = 'field_room_slots_types_allowed_node';
+  $handler->display->display_options['relationships']['field_room_slots_types_allowed_node']['required'] = TRUE;
+  /* Field: Field collection item: Field collection item ID */
+  $handler->display->display_options['fields']['item_id']['id'] = 'item_id';
+  $handler->display->display_options['fields']['item_id']['table'] = 'field_collection_item';
+  $handler->display->display_options['fields']['item_id']['field'] = 'item_id';
+  $handler->display->display_options['fields']['item_id']['label'] = '';
+  $handler->display->display_options['fields']['item_id']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['item_id']['element_label_colon'] = 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']['relationship'] = 'field_room_slots_types_allowed_node';
+  $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: Field collection item: Time Slot */
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['id'] = 'field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['table'] = 'field_data_field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['field'] = 'field_slot_types_time_slot';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['label'] = '';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['type'] = 'entityreference_entity_id';
+  $handler->display->display_options['fields']['field_slot_types_time_slot']['settings'] = array(
+    'link' => 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']['relationship'] = 'field_room_slots_types_allowed_node';
+  $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: 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';
+  $handler->display->display_options['fields']['view']['label'] = '';
+  $handler->display->display_options['fields']['view']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['view']['view'] = 'sessions';
+  $handler->display->display_options['fields']['view']['display'] = 'block_3';
+  $handler->display->display_options['fields']['view']['arguments'] = '[!item_id]/!2';
+  /* 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['sorts']['title']['relationship'] = 'field_room_slots_types_allowed_node';
+  /* Contextual filter: Field collection item: Time Slot (field_slot_types_time_slot) */
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['id'] = 'field_slot_types_time_slot_target_id';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['table'] = 'field_data_field_slot_types_time_slot';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['field'] = 'field_slot_types_time_slot_target_id';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_slot_types_time_slot_target_id']['summary_options']['items_per_page'] = '25';
+  /* Contextual filter: Field collection item: Allowed Schedule Types (field_slot_types_allowed) */
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['id'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['table'] = 'field_data_field_slot_types_allowed';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['field'] = 'field_slot_types_allowed_value';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['limit'] = '0';
+  $handler->display->display_options['arguments']['field_slot_types_allowed_value']['break_phrase'] = TRUE;
+  /* 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']['relationship'] = 'field_room_slots_types_allowed_node';
+  $handler->display->display_options['filters']['status']['value'] = '1';
+
+  /* Display: Block */
+  $handler = $view->new_display('block', 'Block', 'block');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+
+  $export['cod_session_schedule_entity'] = $view;
+
   return $export;
 }
diff --git a/cod_session/cod_session_scheduler.inc b/cod_session/cod_session_scheduler.inc
new file mode 100755
index 0000000000000000000000000000000000000000..94545c50b1fceebb2d80832bf5f9949489b6e989
--- /dev/null
+++ b/cod_session/cod_session_scheduler.inc
@@ -0,0 +1,257 @@
+<?php
+
+/* this file works on the global scheduling system, which populates the field collection within the room CT.
+ * its needed for allocating what timeslots/room combos are allowed to host what
+ * This file is self_contained for the most part, and probably could use cleanup/merging with the session module
+ * to consolidating helper functions.
+ */
+
+/**
+ * Custom schedule form.
+ * This will build a schedule grid where you can select which rooms should have what items in it
+ * Basically this is an empty theme callback that renders the children. When someone wants to take on theming, they can do it here
+ */
+function theme_cod_session_scheduler_form($variables) {
+
+  // Isolate the form definition form the $variables array
+  $form = $variables['form'];
+  $output = '';
+  // Pass the remaining form elements through drupal_render_children()
+  $output .= drupal_render_children($form);
+  // return the output
+  return $output;
+
+}
+
+/*
+ * The main form shown to users wishing to make the master schedule grid. This loops through rooms and timeslots, showing the user
+ * rendered form elements from the field_collection field info.
+ */
+function cod_session_scheduler_form($form, &$form_state, $day) {
+  $days = cod_session_days();
+  // TODO: Workaround for the default schedule page, lets just redirect to the first day. Someday make this a listing page instead. See cod_session.module for details
+  if($day == 'schedule') {
+    $date = new DateObject(array_shift($days), NULL, 'l F, d Y');
+    drupal_goto('admin/conference/config/schedule/'.date_format_date($date, 'custom', 'Y-m-d'));
+  }
+  $form['instructions']['#markup'] = t('This form allows you to specify which
+    kinds of schedulable items may be scheduled in each room during a particular timeslot.');
+  
+  // For single day events:
+  if ($day == 'schedule') {
+    foreach($days AS $day_format => $day) {
+      $date = new DateObject($day_format, NULL, 'l F, d Y');
+      $day =  date_format_date($date, 'custom', 'Y-m-d');
+    }
+  }
+
+  $time_slots = _cod_session_get_timeslots($day);
+  $room_slots = _cod_session_get_rooms();
+
+  //this stores the room form elements
+  $room_array = array();
+
+  //iterate through the timeslots and generate forms for each room
+  foreach($time_slots AS $time_slot) {
+    $time_slot = node_load($time_slot->nid);
+
+    $form[$time_slot->nid] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Timeslot: @time_slot-title', array('@time_slot-title' => $time_slot->title)),
+      '#collapsible' => FALSE,
+      '#collapsed' => FALSE,
+    );
+
+    //Don't want this to be called every time within the foreach, so lets set it here.
+    $slot_types_field = field_info_field('field_slot_types_allowed');
+
+    //Loop through each room slot and give us ths slot_types allowed and capacity.
+    foreach($room_slots AS $room) {
+      $room = node_load($room->nid);
+      $key = cod_session_get_collection_entity($room->nid, $time_slot->nid) ? cod_session_get_collection_entity ($room->nid, $time_slot->nid) :  $room->nid .'-'. $time_slot->nid;
+      $form[$time_slot->nid][$key.'_room_name'] = array(
+        '#markup' => t('Room: @room-title', array('@room-title' => $room->title)),
+      );
+      $form[$time_slot->nid][$room->nid][$key.'-field_slot_types_allowed'] = array(
+        '#title' => t('Allowed types'),
+        '#type' => 'checkboxes',
+        '#options' => $slot_types_field['settings']['allowed_values'],
+        '#default_value' => _cod_session_get_room_slots_types_allowed($room->nid, $time_slot->nid),
+        '#required' => FALSE,
+        '#multiple' => TRUE,
+      );
+      $form[$time_slot->nid][$room->nid][$key.'-field_slot_types_capacity'] = array(
+        '#title' => t('Room Capacity'),
+        '#type' => 'textfield',
+        '#maxlength' => 4,
+        '#size' => 4,
+        '#default_value' => _cod_session_get_room_slots_types_capacity($room->nid, $time_slot->nid),
+        '#required' => FALSE,
+        '#description' => t('The maximum number of simultaneous sessions of all types that are permitted in %room-title during the timeslot %time_slot_title.', array('%room-title' => $room->title, '%time_slot_title' => $time_slot->title)),
+      );
+    }
+  }
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Confirm this time slot for day ' . $day),
+  );
+  //custom submit functions for some sanity checking. Probably could use some more sanity
+  //nothing we really need to validate at this point
+  $form['#submit'][] = 'cod_session_scheduler_form_submit';
+
+  return $form;
+
+}
+
+/**
+ * Submit handler for scheduling form.
+ */
+function cod_session_scheduler_form_submit($form, $form_state) {
+  module_load_include('inc', 'node', 'node.pages');
+
+  //grab our key again
+  //parse the form to see if its an entity already or if we need to create it
+  foreach($form_state['complete form'] AS $time_nid => $element) {
+    if(is_array($element) && is_numeric($time_nid)) { //we have a nid array
+     foreach($element AS $room_nid => $fields) {
+       $entity = FALSE;
+       $key = '';
+       if(cod_session_get_collection_entity($room_nid, $time_nid)) {
+         $key = cod_session_get_collection_entity($room_nid, $time_nid);
+         $entity = TRUE;
+       }
+       else {
+         $key = $room_nid .'-'. $time_nid;
+       }
+
+       //check to see if the fields are set, that means this array is the correct one we're looking for
+       if(is_numeric($room_nid) && isset($fields[$key.'-field_slot_types_allowed']) && isset($fields[$key.'-field_slot_types_capacity'])) {
+         //check for empty values
+          if(empty($fields[$key.'-field_slot_types_allowed']['#value'])) {
+            //if the entity already exists, we don't want to destroy it, rather we want to unset the keys.
+            //By doing this, the form will override the default values supplied by the field collection.
+            if($entity == TRUE) {
+              $field_collection_item = field_collection_item_load($key); // Load that field collection item.
+              $field_collection_item->field_slot_types_allowed = array();
+              $field_collection_item->field_slot_types_capacity = array();
+              $field_collection_item->save(); // Save field-collection item.
+              continue;
+            }
+            else {
+              continue;
+            }
+          }
+          $node = node_load($room_nid);
+          //we have good data, and its been saved before (entity exists) lets resave it
+          if($entity == TRUE) {
+            // Get field collection item value.
+            $field_collection_item = field_collection_item_load($key); // Load that field collection item.
+            //unset the old values, otherwise the data won't save properly.
+            $field_collection_item->field_slot_types_allowed = array();
+            $field_collection_item->field_slot_types_capacity = array();
+            $delta = 0;
+            foreach($fields[$key.'-field_slot_types_allowed']['#value'] AS $element) {
+              $field_collection_item->field_slot_types_allowed[LANGUAGE_NONE][$delta]['value'] = $element;
+              $delta++;
+            }
+            $field_collection_item->field_slot_types_capacity[LANGUAGE_NONE][0]['value'] = $fields[$key.'-field_slot_types_capacity']['#value'] ? $fields[$key.'-field_slot_types_capacity']['#value'] : 1;
+            $field_collection_item->save(); // Save field-collection item.
+          }
+
+          else {
+            $values = array();
+            $values['field_name'] = 'field_room_slots_types_allowed';
+            $values['field_slot_types_time_slot'][LANGUAGE_NONE][0]['target_id'] = $time_nid;
+            foreach($fields[$key.'-field_slot_types_allowed']['#value'] AS $element) {
+              $values['field_slot_types_allowed'][LANGUAGE_NONE][]['value'] = $element;
+            }
+            $values['field_slot_types_capacity'][LANGUAGE_NONE][0]['value'] = $fields[$key.'-field_slot_types_capacity']['#value'] ? $fields[$key.'-field_slot_types_capacity']['#value'] : 1;
+            $field_collection_item = entity_create('field_collection_item', $values);
+            $field_collection_item->setHostEntity('node', $node);
+            $field_collection_item->save();
+          }
+       }
+     }
+    }
+  }
+}
+
+function _cod_session_get_timeslots($day = NULL) {
+  $time_slots = array();
+
+  // No view so default to all time slots within this day.
+  $sql = "SELECT n.nid
+    FROM {node} n
+    INNER JOIN {field_data_field_slot_datetime} s ON n.nid = s.entity_id AND n.vid = s.revision_id
+    WHERE n.type = 'time_slot' AND n.status = 1";
+  if ($day) {
+    $sql .= " AND DATE_FORMAT(s.field_slot_datetime_value, '%Y-%m-%d') = :day";
+  }
+  $sql .= " ORDER BY s.field_slot_datetime_value ASC";
+  $result = db_query($sql, array(':day' => $day));
+  foreach ($result as $record) {
+    $time_slots[] = $record;
+  }
+  return $time_slots;
+}
+
+function _cod_session_get_rooms() {
+  $rooms = array();
+
+  $sql = "SELECT n.nid FROM {node} n WHERE n.type = 'room'";
+  $result = db_query($sql);
+  foreach ($result as $record) {
+    $rooms[] = $record;
+  }
+  return $rooms;
+}
+
+/*
+ * Get the Entity field collection that contains the room/timeslot/allowed types combo
+ *
+ * @return false if there is none found, entity ID if found
+ */
+function _cod_session_get_room_slots_types_allowed($room_nid, $time_nid) {
+
+  $entity_id = cod_session_get_collection_entity($room_nid, $time_nid);
+  if(!empty($entity_id)) {
+    $sql = "SELECT sa.field_slot_types_allowed_value
+      FROM {field_data_field_slot_types_allowed} sa, {field_data_field_slot_types_time_slot} st
+      WHERE sa.entity_id = :entity_id AND st.entity_id = :entity_id AND st.field_slot_types_time_slot_target_id = :time_nid";
+    $result = db_query($sql, array('entity_id' => $entity_id, ':time_nid' => $time_nid));
+    $return = array();
+    foreach($result as $record) {
+      $return[$record->field_slot_types_allowed_value] = $record->field_slot_types_allowed_value;
+    }
+    return $return;
+  } 
+  else {
+    //get the default for the field
+    $info = field_info_instances('field_collection_item','field_room_slots_types_allowed');
+    if(!empty($info['field_slot_types_allowed']['default_value'])) {
+      $return[$info['field_slot_types_allowed']['default_value'][0]['value']] = $info['field_slot_types_allowed']['default_value'][0]['value'];
+      return $return;
+    }
+    else {
+      return array();
+    }
+  }
+}
+
+function _cod_session_get_room_slots_types_capacity($room_nid, $time_nid) {
+  $entity_id = cod_session_get_collection_entity($room_nid, $time_nid);
+  //second it looks like we do, lets make sure it has some data, and return it!
+  if(!empty($entity_id)) {
+    $sql = "SELECT sa.field_slot_types_capacity_value
+      FROM {field_data_field_slot_types_capacity} sa, {field_data_field_slot_types_time_slot} st
+      WHERE sa.entity_id = :entity_id AND st.entity_id = :entity_id AND st.field_slot_types_time_slot_target_id = :time_nid";
+    $result = db_query($sql, array('entity_id' => $entity_id, ':time_nid' => $time_nid));
+    foreach($result as $record) {
+      $return = $record->field_slot_types_capacity_value;
+      return $return;
+    }
+  }
+  else {
+    return '1'; //by default we return a 1
+  }
+}
