diff --git a/cod_base/cod_base.module b/cod_base/cod_base.module
index 9db0272..6dfff92 100644
--- a/cod_base/cod_base.module
+++ b/cod_base/cod_base.module
@@ -75,3 +75,13 @@ function cod_base_field_formatter_view($entity_type, $entity, $field, $instance,
   }
   return $elements;
 }
+
+/**
+* Implements hook_entity_info_alter().
+*/
+function cod_base_entity_info_alter(&$entity_info) {
+  $entity_info['node']['view modes']['listing'] = array(
+    'label' => t('Listing'),
+    'custom settings' => TRUE,
+  );
+}
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index d470e13..a7c4f91 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -147,6 +147,12 @@ function cod_session_field_default_fields() {
           'type' => 'text_default',
           'weight' => '3',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'hidden',
           'module' => 'text',
@@ -222,6 +228,12 @@ function cod_session_field_default_fields() {
           'type' => 'text_default',
           'weight' => '0',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -294,6 +306,12 @@ function cod_session_field_default_fields() {
           'type' => 'image',
           'weight' => '2',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -366,6 +384,12 @@ function cod_session_field_default_fields() {
           'type' => 'number_integer',
           'weight' => '1',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -447,6 +471,12 @@ function cod_session_field_default_fields() {
           'type' => 'text_default',
           'weight' => '0',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'hidden',
           'module' => 'text',
@@ -529,6 +559,12 @@ function cod_session_field_default_fields() {
           'type' => 'list_default',
           'weight' => '2',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -564,14 +600,7 @@ function cod_session_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
         'target_id' => array(
           0 => 'target_id',
@@ -618,6 +647,12 @@ function cod_session_field_default_fields() {
           'type' => 'entityreference_label',
           'weight' => 8,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -653,14 +688,7 @@ function cod_session_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
         'target_id' => array(
           0 => 'target_id',
@@ -707,6 +735,12 @@ function cod_session_field_default_fields() {
           'type' => 'entityreference_label',
           'weight' => 7,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -784,6 +818,12 @@ function cod_session_field_default_fields() {
           'type' => 'text_default',
           'weight' => '0',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'hidden',
           'module' => 'text',
@@ -871,6 +911,12 @@ function cod_session_field_default_fields() {
           'type' => 'list_default',
           'weight' => '8',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -945,6 +991,12 @@ function cod_session_field_default_fields() {
           'type' => 'list_default',
           'weight' => '6',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -980,14 +1032,7 @@ function cod_session_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
         'target_id' => array(
           0 => 'target_id',
@@ -1034,6 +1079,12 @@ function cod_session_field_default_fields() {
           'type' => 'entityreference_label',
           'weight' => 11,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -1069,14 +1120,7 @@ function cod_session_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'node' => array(
-          'columns' => array(
-            'target_id' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
         'target_id' => array(
           0 => 'target_id',
@@ -1123,6 +1167,12 @@ function cod_session_field_default_fields() {
           'type' => 'entityreference_label',
           'weight' => 10,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -1158,14 +1208,7 @@ function cod_session_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'users' => array(
-          'columns' => array(
-            'target_id' => 'uid',
-          ),
-          'table' => 'users',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
         'target_id' => array(
           0 => 'target_id',
@@ -1210,6 +1253,12 @@ function cod_session_field_default_fields() {
           'type' => 'entityreference_label',
           'weight' => 9,
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -1288,6 +1337,12 @@ function cod_session_field_default_fields() {
           'type' => 'file_default',
           'weight' => '2',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -1365,6 +1420,12 @@ function cod_session_field_default_fields() {
           'type' => 'list_default',
           'weight' => '5',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -1457,6 +1518,12 @@ function cod_session_field_default_fields() {
           'type' => 'date_default',
           'weight' => '0',
         ),
+        'listing' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
         'teaser' => array(
           'label' => 'above',
           'module' => 'date',
diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc
index 6399def..fa9275e 100644
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -53,7 +53,10 @@ function cod_session_flag_default_flags() {
       'unflag' => array(),
     ),
     'weight' => 0,
+    'show_on_page' => 1,
+    'show_on_teaser' => 1,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 1,
@@ -87,7 +90,10 @@ function cod_session_flag_default_flags() {
       'unflag' => array(),
     ),
     'weight' => 0,
+    'show_on_page' => 1,
+    'show_on_teaser' => 0,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 0,
@@ -124,7 +130,10 @@ function cod_session_flag_default_flags() {
       ),
     ),
     'weight' => 0,
+    'show_on_page' => 1,
+    'show_on_teaser' => 0,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 0,
diff --git a/cod_session_evaluations/cod_session_evaluations.features.field.inc b/cod_session_evaluations/cod_session_evaluations.features.field.inc
index 058c466..a9c87c8 100644
--- a/cod_session_evaluations/cod_session_evaluations.features.field.inc
+++ b/cod_session_evaluations/cod_session_evaluations.features.field.inc
@@ -10,7 +10,7 @@
 function cod_session_evaluations_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-session_evaluation-body'
+  // Exported field: 'node-session_evaluation-body'.
   $fields['node-session_evaluation-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -36,6 +36,7 @@ function cod_session_evaluations_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -99,7 +100,7 @@ function cod_session_evaluations_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session_evaluation-field_eval_session'
+  // Exported field: 'node-session_evaluation-field_eval_session'.
   $fields['node-session_evaluation-field_eval_session'] = array(
     'field_config' => array(
       'active' => '1',
@@ -110,40 +111,37 @@ function cod_session_evaluations_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 0,
-          'schedule_item' => 0,
-          'session' => 'session',
-          'session_evaluation' => 0,
-          'time_slot' => 0,
-          'webform' => 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(
+            'session' => 'session',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
       'translatable' => '0',
-      'type' => 'node_reference',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session_evaluation',
@@ -153,12 +151,14 @@ function cod_session_evaluations_field_default_fields() {
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
           'weight' => 1,
         ),
-        'ical' => array(
+        'listing' => array(
           'label' => 'above',
           'settings' => array(),
           'type' => 'hidden',
@@ -180,20 +180,9 @@ function cod_session_evaluations_field_default_fields() {
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'nodereference_url',
-        'settings' => array(
-          'autocomplete_match' => 'contains',
-          'edit_fallback' => 0,
-          'fallback' => 'select',
-          'node_link' => array(
-            'destination' => 'source',
-            'full' => 1,
-            'hover_title' => 'Fill out a short survey about this session',
-            'teaser' => 0,
-            'title' => 'Provide feedback on this session',
-          ),
-        ),
-        'type' => 'nodereference_url',
+        'module' => 'options',
+        'settings' => array(),
+        'type' => 'options_select',
         'weight' => '-3',
       ),
     ),
diff --git a/cod_session_evaluations/cod_session_evaluations.info b/cod_session_evaluations/cod_session_evaluations.info
index b817b08..9b32782 100644
--- a/cod_session_evaluations/cod_session_evaluations.info
+++ b/cod_session_evaluations/cod_session_evaluations.info
@@ -2,12 +2,15 @@ name = COD Session Evaluations
 description = Allow users to provide feedback about sessions
 core = 7.x
 package = COD
+php = 5.2.4
 project = cod_session_evaluations
 dependencies[] = cod_session
 dependencies[] = content_access
+dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = node_reference
 dependencies[] = nodereference_url
+dependencies[] = options
 dependencies[] = strongarm
 dependencies[] = views
 dependencies[] = views_data_export
@@ -17,6 +20,7 @@ features[features_api][] = api:1
 features[field][] = node-session_evaluation-body
 features[field][] = node-session_evaluation-field_eval_session
 features[node][] = session_evaluation
+features[user_permission][] = create session_evaluation content
 features[variable][] = ant_pattern_session_evaluation
 features[variable][] = ant_session_evaluation
 features[variable][] = cod_unique_session_evaluation
@@ -27,6 +31,7 @@ features[variable][] = comment_form_location_session_evaluation
 features[variable][] = comment_preview_session_evaluation
 features[variable][] = comment_session_evaluation
 features[variable][] = comment_subject_field_session_evaluation
+features[variable][] = field_bundle_settings_node__session_evaluation
 features[variable][] = menu_options_session_evaluation
 features[variable][] = menu_parent_session_evaluation
 features[variable][] = node_options_session_evaluation
diff --git a/cod_session_evaluations/cod_session_evaluations.module b/cod_session_evaluations/cod_session_evaluations.module
index 035eca0..7252cf7 100644
--- a/cod_session_evaluations/cod_session_evaluations.module
+++ b/cod_session_evaluations/cod_session_evaluations.module
@@ -10,29 +10,44 @@ include_once 'cod_session_evaluations.features.inc';
 * Implements hook_form_alter().
 */
 function cod_session_evaluations_form_session_evaluation_node_form_alter(&$form, &$form_state, $form_id) {
-  if (!empty($form['field_eval_session'][LANGUAGE_NONE][0]['nid']['#default_value'])) {
-      $session_nid = $form['field_eval_session'][LANGUAGE_NONE][0]['nid']['#default_value'];
-  }
-  // If the user has already reviewed the referenced session, don't let her
-  // submit another session evaluation.
-  if (cod_session_evaluations_user_reviewed_session($form['uid']['#value'], $session_nid)) {
-    $form['#access'] = FALSE;
-    drupal_set_message(t('You have already evaluated this session. You can only submit one evaluation per session.'));
-    drupal_goto('node/'. $session_nid);
+  if (!empty($form['field_eval_session']['und']['#default_value'])) {
+    $session_nid = $form['field_eval_session']['und']['#default_value'];
+    $form['field_eval_session']['#disabled'] = TRUE;
+    // If the user has already reviewed the referenced session, don't let her
+    // submit another session evaluation.
+    if (cod_session_evaluations_user_reviewed_session($form['uid']['#value'], $session_nid[0])) {
+      $form['#access'] = FALSE;
+      drupal_set_message(t('You have already evaluated this session. You can only submit one evaluation per session.'));
+      drupal_goto('node/'. $session_nid[0]);
+    }
   }
 }
 
 
+
 /**
-* Implements hook_node_view_alter().
+* Implements hook_node_view().
 */
-function cod_session_evaluations_node_view_alter(&$build) {
+function cod_session_evaluations_node_view($node, $view_mode, $langcode) {
   global $user;
   $account = $user;
+  $bundle = 'session';
   // Hide the "Provide feedback on this session" links if the user has already
   // submitted a survey about this session.
-  if (cod_session_evaluations_user_reviewed_session($account->uid, $build['#node']->nid)) {
-    unset($build['links']['nodereference_url']['#links']['session_evaluation_field_eval_session']);
+  if (!cod_session_evaluations_user_reviewed_session($account->uid, $node->nid) && $node->type == $bundle) {
+    $links = array(
+      'feedback' => array(
+        'title' => variable_get('cod_session_evaluations_feedback_text', t('Provide feedback on this session')),
+        'href' => 'node/add/session-evaluation',
+        'query' => array('nid' => $node->nid, 'destination' => $_GET['q']),
+      ),
+    );
+
+    $node->content['links']['cod_session_evaluations_feedback'] = array(
+      '#theme' => 'links__node__cod_session_evaluations_feedback',
+      '#links' => $links,
+      '#attributes' => array('class' => array('links', 'inline')),
+    );
   }
 }
 
@@ -42,10 +57,20 @@ function cod_session_evaluations_node_view_alter(&$build) {
 function cod_session_evaluations_node_validate($node, $form, &$form_state) {
   if ($node->type == 'session_evaluation') {
     // Check if user has already submitted an evaluation for this session.
-    if (cod_session_evaluations_user_reviewed_session($form['uid']['#value'], $form['field_eval_session'][LANGUAGE_NONE][0]['nid']['nid']['#value'])) {
-      $nids = array_keys($result['node']);
+    if (cod_session_evaluations_user_reviewed_session($form['uid']['#value'], $form['field_eval_session']['und']['#value'])) {
       form_set_error('field_eval_session', t('You have already evaluated this session. You can only submit one evaluation per session.'));
-    }   
+    }
+  }
+}
+
+/**
+ * Implements hook_field_widget_form_alter().
+ */
+function cod_session_evaluations_field_widget_form_alter(&$element, &$form_state, $context) {
+  $field_name = 'field_eval_session';
+  // Set a default value based on the nid.
+  if (isset($element['#field_name']) && $element['#field_name'] == $field_name && isset($_GET['nid'])) {
+    $element['#default_value'] = $_GET['nid'];
   }
 }
 
@@ -59,8 +84,8 @@ function cod_session_evaluations_user_reviewed_session($uid, $nid) {
     ->propertyCondition('status', 1)
     ->propertyCondition('type', 'session_evaluation')
     ->propertyCondition('uid', $uid)
-    ->fieldCondition('field_eval_session', 'nid', $nid);
-  $result = $query->execute(); 
+    ->fieldCondition('field_eval_session', 'target_id', $nid);
+  $result = $query->execute();
   return !empty($result['node']);
 }
 
diff --git a/cod_session_evaluations/cod_session_evaluations.strongarm.inc b/cod_session_evaluations/cod_session_evaluations.strongarm.inc
index 75046a1..96c6fcc 100644
--- a/cod_session_evaluations/cod_session_evaluations.strongarm.inc
+++ b/cod_session_evaluations/cod_session_evaluations.strongarm.inc
@@ -10,77 +10,94 @@
 function cod_session_evaluations_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 = 'ant_pattern_session_evaluation';
   $strongarm->value = '[current-user:name]\'s evaluation of [node:field_eval_session]';
   $export['ant_pattern_session_evaluation'] = $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 = 'ant_session_evaluation';
   $strongarm->value = '1';
   $export['ant_session_evaluation'] = $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 = 'cod_unique_session_evaluation';
   $strongarm->value = 'single';
   $export['cod_unique_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = 0;
   $export['comment_anonymous_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = 1;
   $export['comment_default_mode_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = '50';
   $export['comment_default_per_page_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = 1;
   $export['comment_form_location_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = '1';
   $export['comment_preview_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = '2';
   $export['comment_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = 1;
   $export['comment_subject_field_session_evaluation'] = $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__session_evaluation';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '-5',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__session_evaluation'] = $strongarm;
+
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_session_evaluation';
@@ -89,14 +106,14 @@ function cod_session_evaluations_strongarm() {
   );
   $export['menu_options_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_session_evaluation'] = $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_session_evaluation';
@@ -106,14 +123,14 @@ function cod_session_evaluations_strongarm() {
   );
   $export['node_options_session_evaluation'] = $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_session_evaluation';
   $strongarm->value = '1';
   $export['node_preview_session_evaluation'] = $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_session_evaluation';
diff --git a/cod_session_evaluations/cod_session_evaluations.views_default.inc b/cod_session_evaluations/cod_session_evaluations.views_default.inc
index 6929b6d..3a10a26 100644
--- a/cod_session_evaluations/cod_session_evaluations.views_default.inc
+++ b/cod_session_evaluations/cod_session_evaluations.views_default.inc
@@ -65,23 +65,21 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
   $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* Relationship: Content: Session being evaluated (field_eval_session) */
-  $handler->display->display_options['relationships']['field_eval_session_nid']['id'] = 'field_eval_session_nid';
-  $handler->display->display_options['relationships']['field_eval_session_nid']['table'] = 'field_data_field_eval_session';
-  $handler->display->display_options['relationships']['field_eval_session_nid']['field'] = 'field_eval_session_nid';
-  $handler->display->display_options['relationships']['field_eval_session_nid']['required'] = 0;
-  $handler->display->display_options['relationships']['field_eval_session_nid']['delta'] = '-1';
   /* Relationship: Content: Author */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'node';
   $handler->display->display_options['relationships']['uid']['field'] = 'uid';
   $handler->display->display_options['relationships']['uid']['required'] = 0;
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_eval_session_target_id']['id'] = 'field_eval_session_target_id';
+  $handler->display->display_options['relationships']['field_eval_session_target_id']['table'] = 'field_data_field_eval_session';
+  $handler->display->display_options['relationships']['field_eval_session_target_id']['field'] = 'field_eval_session_target_id';
+  $handler->display->display_options['relationships']['field_eval_session_target_id']['required'] = 1;
   /* Field: Content: Session being evaluated */
   $handler->display->display_options['fields']['field_eval_session_1']['id'] = 'field_eval_session_1';
   $handler->display->display_options['fields']['field_eval_session_1']['table'] = 'field_data_field_eval_session';
   $handler->display->display_options['fields']['field_eval_session_1']['field'] = 'field_eval_session';
   $handler->display->display_options['fields']['field_eval_session_1']['label'] = '';
-  $handler->display->display_options['fields']['field_eval_session_1']['exclude'] = TRUE;
   $handler->display->display_options['fields']['field_eval_session_1']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['alter']['absolute'] = 0;
@@ -100,35 +98,8 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['field_eval_session_1']['hide_empty'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'node_reference_nid';
+  $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'entityreference_entity_id';
   $handler->display->display_options['fields']['field_eval_session_1']['field_api_classes'] = 0;
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name']['id'] = 'name';
-  $handler->display->display_options['fields']['name']['table'] = 'users';
-  $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'uid';
-  $handler->display->display_options['fields']['name']['label'] = 'Evaluator';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['name']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['name']['link_to_user'] = 1;
-  $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
-  $handler->display->display_options['fields']['name']['format_username'] = 1;
   /* Field: Evaluation link */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -178,12 +149,16 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['field_eval_session']['hide_empty'] = 0;
   $handler->display->display_options['fields']['field_eval_session']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_eval_session']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_eval_session']['type'] = 'entityreference_entity_view';
+  $handler->display->display_options['fields']['field_eval_session']['settings'] = array(
+    'view_mode' => 'listing',
+  );
   $handler->display->display_options['fields']['field_eval_session']['field_api_classes'] = 0;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
-  $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_nid';
+  $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_target_id';
   $handler->display->display_options['fields']['field_accepted']['label'] = 'Session Status';
   $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
@@ -216,21 +191,25 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'session_evaluation' => 'session_evaluation',
   );
-  /* Filter criterion: Content: Session being evaluated (field_eval_session) */
-  $handler->display->display_options['filters']['field_eval_session_nid']['id'] = 'field_eval_session_nid';
-  $handler->display->display_options['filters']['field_eval_session_nid']['table'] = 'field_data_field_eval_session';
-  $handler->display->display_options['filters']['field_eval_session_nid']['field'] = 'field_eval_session_nid';
-  $handler->display->display_options['filters']['field_eval_session_nid']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['field_eval_session_nid']['expose']['operator_id'] = 'field_eval_session_nid_op';
-  $handler->display->display_options['filters']['field_eval_session_nid']['expose']['label'] = 'Session';
-  $handler->display->display_options['filters']['field_eval_session_nid']['expose']['operator'] = 'field_eval_session_nid_op';
-  $handler->display->display_options['filters']['field_eval_session_nid']['expose']['identifier'] = 'field_eval_session_nid';
-  $handler->display->display_options['filters']['field_eval_session_nid']['expose']['reduce'] = 0;
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* 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;
+  /* Filter criterion: Content: Title */
+  $handler->display->display_options['filters']['title']['id'] = 'title';
+  $handler->display->display_options['filters']['title']['table'] = 'node';
+  $handler->display->display_options['filters']['title']['field'] = 'title';
+  $handler->display->display_options['filters']['title']['relationship'] = 'field_eval_session_target_id';
+  $handler->display->display_options['filters']['title']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['label'] = 'Title';
+  $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+  $handler->display->display_options['filters']['title']['expose']['required'] = 0;
+  $handler->display->display_options['filters']['title']['expose']['multiple'] = FALSE;
 
   /* Display: Admin Eval Report */
   $handler = $view->new_display('page', 'Admin Eval Report', 'page');
@@ -276,35 +255,8 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['field_eval_session_1']['hide_empty'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_eval_session_1']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'node_reference_nid';
+  $handler->display->display_options['fields']['field_eval_session_1']['type'] = 'entityreference_entity_id';
   $handler->display->display_options['fields']['field_eval_session_1']['field_api_classes'] = 0;
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name']['id'] = 'name';
-  $handler->display->display_options['fields']['name']['table'] = 'users';
-  $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'uid';
-  $handler->display->display_options['fields']['name']['label'] = 'Evaluator';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['more_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['name']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['name']['link_to_user'] = 1;
-  $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
-  $handler->display->display_options['fields']['name']['format_username'] = 1;
   /* Field: Evaluation link */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -314,7 +266,7 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['nothing']['alter']['text'] = 'sessions-eval/[field_eval_session_1]';
   $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 1;
   $handler->display->display_options['fields']['nothing']['alter']['path'] = 'sessions-eval/[field_eval_session_1]';
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 1;
   $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
   $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
   $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
@@ -359,7 +311,7 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
   $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
-  $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_nid';
+  $handler->display->display_options['fields']['field_accepted']['relationship'] = 'field_eval_session_target_id';
   $handler->display->display_options['fields']['field_accepted']['label'] = 'Session Status';
   $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
@@ -426,19 +378,17 @@ function cod_session_evaluations_views_default_views() {
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Content: Session being evaluated (field_eval_session) */
-  $handler->display->display_options['arguments']['field_eval_session_nid']['id'] = 'field_eval_session_nid';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['table'] = 'field_data_field_eval_session';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['field'] = 'field_eval_session_nid';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['default_action'] = 'not found';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['title_enable'] = 1;
-  $handler->display->display_options['arguments']['field_eval_session_nid']['title'] = 'Evalulation Report: %1';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['default_argument_skip_url'] = 0;
-  $handler->display->display_options['arguments']['field_eval_session_nid']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_eval_session_nid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['field_eval_session_nid']['not'] = 0;
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['id'] = 'field_eval_session_target_id';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['table'] = 'field_data_field_eval_session';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['field'] = 'field_eval_session_target_id';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['default_argument_skip_url'] = 0;
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['break_phrase'] = 0;
+  $handler->display->display_options['arguments']['field_eval_session_target_id']['not'] = 0;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';