diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index a0070c2..d470e13 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -548,7 +548,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '3',
+        'weight' => '7',
       ),
     ),
   );
@@ -557,66 +557,66 @@ function cod_session_field_default_fields() {
   $fields['node-schedule_item-field_session_room'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_session_room',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
       'locked' => '0',
-      'module' => 'node_reference',
+      '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' => '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(
+            'room' => 'room',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'schedule_item',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Select room(s) in which the session occurs.',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '4',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 8,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -637,7 +637,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '5',
+        'weight' => '9',
       ),
     ),
   );
@@ -651,48 +651,46 @@ function cod_session_field_default_fields() {
       'entity_types' => array(),
       'field_name' => 'field_session_slot',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
       'locked' => '0',
-      'module' => 'node_reference',
+      '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' => 0,
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 'time_slot',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        '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' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'schedule_item',
@@ -701,11 +699,13 @@ function cod_session_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '3',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 7,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -716,7 +716,7 @@ function cod_session_field_default_fields() {
       ),
       'entity_type' => 'node',
       'field_name' => 'field_session_slot',
-      'label' => 'Time slot',
+      'label' => 'Time Slot',
       'required' => 0,
       'settings' => array(
         'user_register_form' => FALSE,
@@ -726,7 +726,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '4',
+        'weight' => '8',
       ),
     ),
   );
@@ -890,7 +890,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '8',
+        'weight' => '11',
       ),
     ),
   );
@@ -973,66 +973,66 @@ function cod_session_field_default_fields() {
   $fields['node-session-field_session_room'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_session_room',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
       'locked' => '0',
-      'module' => 'node_reference',
+      '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' => '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(
+            'room' => 'room',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Select room(s) in which the session occurs.',
+      'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '7',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 11,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1053,7 +1053,7 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '7',
+        'weight' => '10',
       ),
     ),
   );
@@ -1067,48 +1067,46 @@ function cod_session_field_default_fields() {
       'entity_types' => array(),
       'field_name' => 'field_session_slot',
       'field_permissions' => array(
-        'type' => '2',
+        'type' => '0',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
       'locked' => '0',
-      'module' => 'node_reference',
+      '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' => 0,
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 'time_slot',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        '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' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
@@ -1117,11 +1115,13 @@ function cod_session_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '6',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 10,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1142,60 +1142,73 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '6',
+        'weight' => '9',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_slides'.
-  $fields['node-session-field_slides'] = array(
+  // Exported field: 'node-session-field_session_speakers'.
+  $fields['node-session-field_session_speakers'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_slides',
+      'field_name' => 'field_session_speakers',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
       'foreign keys' => array(
-        'fid' => array(
+        'users' => array(
           'columns' => array(
-            'fid' => 'fid',
+            'target_id' => 'uid',
           ),
-          'table' => 'file_managed',
+          'table' => 'users',
         ),
       ),
       'indexes' => array(
-        'fid' => array(
-          0 => 'fid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
       'locked' => '0',
-      'module' => 'file',
+      'module' => 'entityreference',
       'settings' => array(
-        'display_default' => 1,
-        'display_field' => 1,
-        'field_permissions' => array(
-          'create' => 'create',
-          'edit' => 0,
-          'edit own' => 'edit own',
-          'view' => 'view',
-          'view own' => 0,
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'field_profile_first:value',
+            'property' => 'uid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(),
         ),
-        'uri_scheme' => 'public',
+        'handler_submit' => 'Change handler',
+        'target_type' => 'user',
       ),
-      'translatable' => '1',
-      'type' => 'file',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
+      'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'file',
-          'settings' => array(),
-          'type' => 'file_default',
-          'weight' => '2',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 9,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1205,52 +1218,52 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_slides',
-      'label' => 'Slides',
-      'required' => 0,
+      'field_name' => 'field_session_speakers',
+      'label' => 'Speaker(s)',
+      'required' => 1,
       'settings' => array(
-        'description_field' => 0,
-        'file_directory' => 'slides',
-        'file_extensions' => 'ppt pdf odt odp',
-        'max_filesize' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'file',
+        'module' => 'entityreference',
         'settings' => array(
-          'progress_indicator' => 'throbber',
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
         ),
-        'type' => 'file_generic',
-        'weight' => '3',
+        'type' => 'entityreference_autocomplete_tags',
+        'weight' => '1',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_speakers'.
-  $fields['node-session-field_speakers'] = array(
+  // Exported field: 'node-session-field_slides'.
+  $fields['node-session-field_slides'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_speakers',
+      'field_name' => 'field_slides',
       'foreign keys' => array(
-        'uid' => array(
+        'fid' => array(
           'columns' => array(
-            'uid' => 'uid',
+            'fid' => 'fid',
           ),
-          'table' => 'users',
+          'table' => 'file_managed',
         ),
       ),
       'indexes' => array(
-        'uid' => array(
-          0 => 'uid',
+        'fid' => array(
+          0 => 'fid',
         ),
       ),
       'locked' => '0',
-      'module' => 'user_reference',
+      'module' => 'file',
       'settings' => array(
+        'display_default' => 1,
+        'display_field' => 1,
         'field_permissions' => array(
           'create' => 'create',
           'edit' => 0,
@@ -1258,37 +1271,22 @@ function cod_session_field_default_fields() {
           'view' => 'view',
           'view own' => 0,
         ),
-        'referenceable_roles' => array(
-          2 => 0,
-          3 => 0,
-          4 => 0,
-          5 => 0,
-        ),
-        'referenceable_status' => array(
-          0 => 0,
-          1 => '1',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
-        ),
+        'uri_scheme' => 'public',
       ),
       'translatable' => '1',
-      'type' => 'user_reference',
+      'type' => 'file',
     ),
     'field_instance' => array(
       'bundle' => 'session',
-      'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Add your username and optionally 1-5 additional speaker usernames.',
+      'description' => 'Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'user_reference',
+          'module' => 'file',
           'settings' => array(),
-          'type' => 'user_reference_default',
-          'weight' => '1',
+          'type' => 'file_default',
+          'weight' => '2',
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1298,22 +1296,24 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_speakers',
-      'label' => 'Speaker(s)',
+      'field_name' => 'field_slides',
+      'label' => 'Slides',
       'required' => 0,
       'settings' => array(
+        'description_field' => 0,
+        'file_directory' => 'slides',
+        'file_extensions' => 'ppt pdf odt odp',
+        'max_filesize' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'user_reference',
+        'module' => 'file',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'user_reference/autocomplete',
-          'size' => '40',
+          'progress_indicator' => 'throbber',
         ),
-        'type' => 'user_reference_autocomplete',
-        'weight' => '1',
+        'type' => 'file_generic',
+        'weight' => '3',
       ),
     ),
   );
@@ -1505,7 +1505,6 @@ function cod_session_field_default_fields() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Add your username and optionally 1-5 additional speaker usernames.');
   t('Body');
   t('Capacity');
   t('Date and time');
@@ -1515,11 +1514,11 @@ function cod_session_field_default_fields() {
   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('Slides');
   t('Speaker(s)');
   t('Status');
+  t('Time Slot');
   t('Time slot');
   t('Track');
   t('Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)');
diff --git a/cod_session/cod_session.features.menu_links.inc b/cod_session/cod_session.features.menu_links.inc
index 55b66b8..b774cb3 100644
--- a/cod_session/cod_session.features.menu_links.inc
+++ b/cod_session/cod_session.features.menu_links.inc
@@ -24,28 +24,9 @@ function cod_session_menu_default_menu_links() {
     'expanded' => '0',
     'weight' => '0',
   );
-  // Exported menu link: menu-menu-quick-links:program/session-schedule/your-schedule
-  $menu_links['menu-menu-quick-links:program/session-schedule/your-schedule'] = array(
-    'menu_name' => 'menu-menu-quick-links',
-    'link_path' => 'program/session-schedule/your-schedule',
-    'router_path' => 'program/session-schedule/your-schedule',
-    'link_title' => 'Your schedule',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Your personal conference schedule',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-  );
   // Translatables
   // Included for use with string extractors like potx.
   t('Sessions');
-  t('Your schedule');
 
 
   return $menu_links;
diff --git a/cod_session/cod_session.field_group.inc b/cod_session/cod_session.field_group.inc
index 2ed24c8..c311b83 100644
--- a/cod_session/cod_session.field_group.inc
+++ b/cod_session/cod_session.field_group.inc
@@ -50,8 +50,8 @@ function cod_session_field_group_info() {
     'label' => 'Audience',
     'weight' => '5',
     'children' => array(
-      0 => 'field_track',
-      1 => 'field_experience',
+      0 => 'field_experience',
+      1 => 'field_track',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -163,9 +163,9 @@ function cod_session_field_group_info() {
     'label' => 'Schedule Info',
     'weight' => '4',
     'children' => array(
-      0 => 'field_session_slot',
-      1 => 'field_session_room',
-      2 => 'field_accepted',
+      0 => 'field_accepted',
+      1 => 'field_session_slot',
+      2 => 'field_session_room',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index fd51739..45b3ac5 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -8,6 +8,7 @@ dependencies[] = auto_nodetitle
 dependencies[] = cod_base
 dependencies[] = date
 dependencies[] = date_popup
+dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = field_group
 dependencies[] = field_permissions
@@ -44,8 +45,8 @@ 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_speakers
 features[field][] = node-session-field_slides
-features[field][] = node-session-field_speakers
 features[field][] = node-session-field_track
 features[field][] = node-time_slot-field_slot_datetime
 features[field_group][] = group_audience|node|session|default
@@ -57,7 +58,6 @@ features[field_group][] = group_schedule|node|session|form
 features[menu_custom][] = main-menu
 features[menu_custom][] = menu-menu-quick-links
 features[menu_links][] = main-menu:program/sessions
-features[menu_links][] = menu-menu-quick-links:program/session-schedule/your-schedule
 features[node][] = page
 features[node][] = room
 features[node][] = schedule_item
@@ -113,6 +113,8 @@ 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__schedule_item
+features[variable][] = field_bundle_settings_node__session
 features[variable][] = menu_options_time_slot
 features[variable][] = menu_parent_time_slot
 features[variable][] = node_options_page
diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
index 86d83de..75f34a6 100644
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -172,7 +172,7 @@ function cod_session_schedule_tabs() {
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function cod_session_form_node_type_form_alter(&$form, &$form_state, $form_id) {
+/*function cod_session_form_node_type_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['#node_type'])) {
     // Provide scheduling controls for this content type.
     $form['cod_session'] = array(
@@ -195,7 +195,7 @@ function cod_session_form_node_type_form_alter(&$form, &$form_state, $form_id) {
       // @todo, also make reference to room spanning?
     );
   }
-}
+}*/
 
 /**
  * Implements hook_form_FORM_ID_alter().
@@ -228,22 +228,6 @@ function cod_session_save_declined_message(&$form, &$form_state) {
  * Implements hook_form_alter().
  */
 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:
-      $form['field_speakers'][LANGUAGE_NONE]['add_more']['#value'] = t('Add another speaker');
-      // Prepopulate the current user into the Speakers field
-      // on new session creation.
-      if (empty($form['#node']->nid)) {
-        global $user;
-        $form['field_speakers'][LANGUAGE_NONE][0]['uid']['#default_value'] = $user->uid;
-      }
-    }
-  }
-  // @todo consider altering user_admin_perm form to disable editing
-  // of edit slot and room permissions?
   if (strpos($form_id, '_node_form') !== FALSE) {
     $types = cod_session_schedulable_types();
     if (empty($types)) {
@@ -265,8 +249,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_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.
-        $room_nid = $form['#node']->field_session_room[LANGUAGE_NONE][0]['nid'];
-        $slot_nid = $form['#node']->field_session_slot[LANGUAGE_NONE][0]['nid'];
+        $room_nid = $form['#node']->field_session_room['und'][0]['target_id'];
+        $slot_nid = $form['#node']->field_session_slot['und'][0]['target_id'];
       }
       else {
         return;
@@ -310,12 +294,12 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
       // Set Room and Time-slot fields. Prepopulate is not used to accomplish
       // this because as of 2.2 Prepopulate doesn't support hidden or access
       // FALSE fields.
-      $form['field_session_room'][LANGUAGE_NONE]['#default_value'][$room_nid] = $room_nid;
-      $form['field_session_slot'][LANGUAGE_NONE]['#default_value'] = $slot_nid;
+      $form['field_session_room']['und']['#default_value'] = $room_nid;
+      $form['field_session_slot']['und']['#default_value'] = $slot_nid;
       // Disable editing and hide the room and slot fields wuth after_build, FAPI!!!
       if (!user_access('edit any ' . $form['#node']->type . ' content')) {
-        $form['field_session_room'][LANGUAGE_NONE]['#access'] = FALSE;
-        $form['field_session_slot'][LANGUAGE_NONE]['#access'] = FALSE;
+        $form['field_session_room']['und']['#access'] = FALSE;
+        $form['field_session_slot']['und']['#access'] = FALSE;
       }
       // Disable node preview because of Prepopulate bug http://drupal.org/node/661842
       unset($form['actions']['preview']);
@@ -329,8 +313,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
 function _cod_session_unschedule(&$form, &$form_state) {
   if ($form_state['values']['op'] == $form_state['values']['cod_unschedule']) {
     // Unset scheduled room and time slot.
-    $form_state['values']['field_session_room'][LANGUAGE_NONE][0]['nid'] = NULL;
-    $form_state['values']['field_session_slot'][LANGUAGE_NONE][0]['nid'] = NULL;
+    $form_state['values']['field_session_room']['und'][0]['target_id'] = NULL;
+    $form_state['values']['field_session_slot']['und'][0]['target_id'] = NULL;
     drupal_set_message(t('%name has been unscheduled. To reshedule, click "Schedule a session" on any available time slot.', array('%name' => $form_state['values']['title'])));
     // @todo set redirect?
   }
@@ -797,7 +781,10 @@ function template_preprocess_cod_session_schedule(&$vars) {
 
   if (!empty($scheduled_items)) {
     foreach ($scheduled_items as $item) {
-      if (!empty($item->field_session_slot[LANGUAGE_NONE][0]['nid']) && !empty($item->field_session_room[LANGUAGE_NONE][0]['nid'])) {
+      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));
         }
@@ -806,16 +793,16 @@ function template_preprocess_cod_session_schedule(&$vars) {
         }
 
         // Handle sessions in multiple rooms.
-        foreach ($item->field_session_room[LANGUAGE_NONE] as $room_instance) {
-          $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['session'] = $item;
-          $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['class'] = $class;
+        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['nid']][] = $item->field_session_slot[LANGUAGE_NONE][0]['nid'];
+          $used_rooms[$room_instance['target_id']][] = $target_slot;
         }
 
       // Create array of populated slots.
-        if (!in_array($item->field_session_slot[LANGUAGE_NONE][0]['nid'], $used_slots)) {
-          $used_slots[] = $item->field_session_slot[LANGUAGE_NONE][0]['nid'];
+        if (!in_array($target_slot, $used_slots)) {
+          $used_slots[] = $target_slot;
         }
       }
       // Record sessions for this user, their call-to-action can use it.
diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc
index a6dd924..a07812f 100644
--- a/cod_session/cod_session.strongarm.inc
+++ b/cod_session/cod_session.strongarm.inc
@@ -230,6 +230,40 @@ 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__schedule_item';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '-5',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__session';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__session'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_time_slot';
   $strongarm->value = array(
     0 => 'main-menu',
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index d84024a..b4af27e 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -47,12 +47,11 @@ function cod_session_views_default_views() {
   $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: Broken/missing handler */
-  $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'] = 'flag: session_schedule';
-  $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
+  /* Relationship: Entity Reference: Referenced Entity */
+  $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;
   /* 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';
@@ -99,32 +98,6 @@ function cod_session_views_default_views() {
   $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']['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'] = 1;
-  $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']['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: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
@@ -147,29 +120,36 @@ function cod_session_views_default_views() {
   $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;
-  /* Field: Broken/missing handler */
-  $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'] = '';
-  $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'] = FALSE;
-  $handler->display->display_options['fields']['ops']['element_default_classes'] = 1;
-  $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'] = 1;
+  /* Field: Content: Speaker(s) */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -199,20 +179,19 @@ function cod_session_views_default_views() {
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
   /* Filter criterion: Content: Room (field_session_room) */
-  $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
-  $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
-  $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
-  $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
+  $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) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1;
+  $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';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['operator'] = 'not empty';
 
   /* Display: Schedule */
   $handler = $view->new_display('page', 'Schedule', 'page_1');
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
   $handler->display->display_options['path'] = 'program/session-schedule/%';
   $handler->display->display_options['menu']['title'] = 'Session Schedule';
   $handler->display->display_options['menu']['weight'] = '-50';
@@ -266,13 +245,13 @@ 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_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -557,7 +536,7 @@ function cod_session_views_default_views() {
   $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;
-  /* Field: Content: Speaker(s) */
+  /* Field: Broken/missing handler */
   $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';
@@ -578,10 +557,6 @@ function cod_session_views_default_views() {
   $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']['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']['field_api_classes'] = 0;
   /* Field: Content: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
@@ -959,12 +934,11 @@ function cod_session_views_default_views() {
   $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: Content: Time slot (field_session_slot) */
+  /* 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['relationships']['field_session_slot_nid']['delta'] = '-1';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
@@ -1099,12 +1073,11 @@ function cod_session_views_default_views() {
   $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: Content: Speaker(s) (field_speakers) */
+  /* 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;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: User: Picture */
   $handler->display->display_options['fields']['picture']['id'] = 'picture';
@@ -1382,7 +1355,7 @@ function cod_session_views_default_views() {
   $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;
-  /* Field: Content: Speaker(s) */
+  /* Field: Broken/missing handler */
   $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';
@@ -1403,10 +1376,6 @@ function cod_session_views_default_views() {
   $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']['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']['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';
@@ -1568,13 +1537,13 @@ 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_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -1809,7 +1778,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = '1';
   $handler->display->display_options['filters']['status']['group'] = 0;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -1819,8 +1788,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['label'] = 'Room';
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['operator'] = 'field_session_room_nid_op';
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['identifier'] = 'room';
-  $handler->display->display_options['filters']['field_session_room_nid']['expose']['reduce'] = 0;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -1985,13 +1953,12 @@ function cod_session_views_default_views() {
   $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: Content: Speaker(s) (field_speakers) */
+  /* 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']['delta'] = '-1';
   /* 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';
@@ -2278,7 +2245,7 @@ function cod_session_views_default_views() {
   $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']['link_to_user'] = 0;
-  /* Field: Content: Speaker(s) */
+  /* Field: Broken/missing handler */
   $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';
@@ -2299,12 +2266,6 @@ function cod_session_views_default_views() {
   $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']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['delta_limit'] = '5';
-  $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;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -2488,7 +2449,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -2546,12 +2507,12 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -2578,13 +2539,12 @@ function cod_session_views_default_views() {
   $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: Content: Speaker(s) (field_speakers) */
+  /* 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']['delta'] = '-1';
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
@@ -2613,7 +2573,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -2625,7 +2585,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['flagged']['field'] = 'flagged';
   $handler->display->display_options['filters']['flagged']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['filters']['flagged']['value'] = '0';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -2662,13 +2622,12 @@ function cod_session_views_default_views() {
   $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: Content: Speaker(s) (field_speakers) */
+  /* 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']['delta'] = '-1';
   /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
@@ -2698,12 +2657,12 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 0;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -2837,7 +2796,7 @@ function cod_session_views_default_views() {
   $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;
-  /* Contextual filter: Content: Speaker(s) (field_speakers) */
+  /* 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';
@@ -2851,8 +2810,6 @@ function cod_session_views_default_views() {
   $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['arguments']['field_speakers_uid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['field_speakers_uid']['not'] = 0;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -2865,13 +2822,13 @@ 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_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';