diff --git a/pushtape_core/pushtape_core.info b/pushtape_core/pushtape_core.info
index fffe48b..614a813 100644
--- a/pushtape_core/pushtape_core.info
+++ b/pushtape_core/pushtape_core.info
@@ -1,16 +1,17 @@
 core = "7.x"
 dependencies[] = "pushtape_music"
+
 description = "A music publishing platform. Easily publish albums or single tracks."
 name = "Pushtape"
-package = "Pushtape"
-project = "pushtape"
-version = "7.x-1.0"
+package = "Pushtape_core"
+project = "pushtape_core"
+version = "7.x-2.0alpha8"
 
 stylesheets[all][] = css/pushtape.css
 scripts[] = js/pushtape.js
 
 ; Information added by drupal.org packaging script on 2011-12-16
-version = "7.x-1.x-dev"
+version = "7.x-2.x-dev"
 core = "7.x"
 project = "pushtape_features"
 datestamp = "1324038299"
diff --git a/pushtape_core/pushtape_core.module b/pushtape_core/pushtape_core.module
index a1f152d..95cb0e1 100644
--- a/pushtape_core/pushtape_core.module
+++ b/pushtape_core/pushtape_core.module
@@ -12,6 +12,8 @@ function pushtape_core_init() {
 
 }
 
+
+
 /**
  * Implementation of hook_form_alter().
  */
@@ -312,9 +314,9 @@ function pushtape_core_node_load($nodes, $types) {
           $node->field_artwork = $album->field_artwork;
           $pushtape_core_override[] = 'field_artwork';
         }
-        if (empty($node->field_artist)) {
-          $node->field_artist = $album->field_artist;
-          $pushtape_core_override[] = 'field_artist';
+        if (empty($node->field_artist_term)) {
+          $node->field_artist_term = $album->field_artist_term;
+          $pushtape_core_override[] = 'field_artist_term';
         }
         if (empty($node->field_release_date)) {
           $node->field_release_date = $album->field_release_date;
@@ -349,7 +351,7 @@ function pushtape_core_field_formatter_info() {
       // the label is is what is displayed in the select box in the UI.
       'label' => t('Ordered list of linked titles'),
       // field types is the important bit!! List the field types your formatter is for.
-      'field types' => array('node_reference'),
+      'field types' => array('entityreference'),
     ),
   );
 }
diff --git a/pushtape_music/pushtape_music.features.field.inc b/pushtape_music/pushtape_music.features.field.inc
index 6ab06d0..567f327 100644
--- a/pushtape_music/pushtape_music.features.field.inc
+++ b/pushtape_music/pushtape_music.features.field.inc
@@ -91,33 +91,38 @@ function pushtape_music_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-album-field_artist'
-  $fields['node-album-field_artist'] = array(
+  // Exported field: 'node-album-field_artist_term'
+  $fields['node-album-field_artist_term'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_artist',
+      'field_name' => 'field_artist_term',
       'foreign keys' => array(
-        'format' => array(
+        'tid' => array(
           'columns' => array(
-            'format' => 'format',
+            'tid' => 'tid',
           ),
-          'table' => 'filter_format',
+          'table' => 'taxonomy_term_data',
         ),
       ),
       'indexes' => array(
-        'format' => array(
-          0 => 'format',
+        'tid' => array(
+          0 => 'tid',
         ),
       ),
-      'module' => 'text',
+      'module' => 'taxonomy',
       'settings' => array(
-        'max_length' => '255',
+        'allowed_values' => array(
+          0 => array(
+            'vocabulary' => 'artist',
+            'parent' => '0',
+          ),
+        ),
       ),
-      'translatable' => '1',
-      'type' => 'text',
+      'translatable' => '0',
+      'type' => 'taxonomy_term_reference',
     ),
     'field_instance' => array(
       'bundle' => 'album',
@@ -126,35 +131,31 @@ function pushtape_music_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'text',
+          'label' => 'above',
+          'module' => 'taxonomy',
           'settings' => array(),
-          'type' => 'text_plain',
-          'weight' => '2',
+          'type' => 'taxonomy_term_reference_link',
+          'weight' => 6,
         ),
-        'full' => array(
-          'label' => 'hidden',
-          'module' => 'text',
+        'teaser' => array(
+          'label' => 'above',
           'settings' => array(),
-          'type' => 'text_default',
-          'weight' => '2',
+          'type' => 'hidden',
+          'weight' => 0,
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_artist',
-      'label' => 'Artist',
+      'field_name' => 'field_artist_term',
+      'label' => 'artist',
       'required' => 0,
       'settings' => array(
-        'text_processing' => '0',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'text',
-        'settings' => array(
-          'size' => '60',
-        ),
-        'type' => 'text_textfield',
+        'module' => 'options',
+        'settings' => array(),
+        'type' => 'options_select',
         'weight' => '4',
       ),
     ),
@@ -214,6 +215,12 @@ function pushtape_music_field_default_fields() {
           'type' => 'image',
           'weight' => '0',
         ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
       ),
       'entity_type' => 'node',
       'field_name' => 'field_artwork',
@@ -298,6 +305,12 @@ function pushtape_music_field_default_fields() {
           'type' => 'text_default',
           'weight' => '4',
         ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
       ),
       'entity_type' => 'node',
       'field_name' => 'field_release_date',
@@ -372,6 +385,12 @@ function pushtape_music_field_default_fields() {
           'type' => 'taxonomy_term_reference_link',
           'weight' => '5',
         ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
       ),
       'entity_type' => 'node',
       'field_name' => 'field_tags',
@@ -397,39 +416,47 @@ function pushtape_music_field_default_fields() {
   $fields['node-album-field_tracklist'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_tracklist',
       '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',
         ),
       ),
-      'module' => 'node_reference',
+      'module' => 'entityreference',
       'settings' => array(
-        'referenceable_types' => array(
-          'album' => 0,
-          'page' => 0,
-          'panel' => 0,
-          'track' => 'track',
-        ),
-        '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' => 'nid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(
+            'track' => 'track',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
       'translatable' => '0',
-      'type' => 'node_reference',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'album',
@@ -439,35 +466,36 @@ function pushtape_music_field_default_fields() {
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'pushtape',
-          'settings' => array(),
-          'type' => 'pushtape_ol_view',
-          'weight' => '1',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 7,
         ),
-        'full' => array(
-          'label' => 'hidden',
-          'module' => 'node_reference',
+        'teaser' => array(
+          'label' => 'above',
           'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '1',
+          'type' => 'hidden',
+          'weight' => 0,
         ),
       ),
       'entity_type' => 'node',
       'field_name' => 'field_tracklist',
-      'label' => 'Tracklist',
+      'label' => 'Tracks',
       'required' => 0,
       'settings' => array(
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'node_reference',
+        'module' => 'entityreference',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'node_reference/autocomplete',
-          'size' => 60,
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
         ),
-        'type' => 'node_reference_autocomplete',
+        'type' => 'entityreference_autocomplete_tags',
         'weight' => '1',
       ),
     ),
@@ -548,7 +576,7 @@ function pushtape_music_field_default_fields() {
           'summary_rows' => 5,
         ),
         'type' => 'text_textarea_with_summary',
-        'weight' => '4',
+        'weight' => '3',
       ),
       'widget_type' => 'text_textarea_with_summary',
     ),
@@ -563,35 +591,42 @@ function pushtape_music_field_default_fields() {
       'entity_types' => array(),
       'field_name' => 'field_album',
       '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',
         ),
       ),
-      'module' => 'node_reference',
+      'module' => 'entityreference',
       'settings' => array(
-        'referenceable_types' => array(
-          'album' => 'album',
-          'article' => 0,
-          'page' => 0,
-          'panel' => 0,
-          'track' => 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' => 'nid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(
+            'album' => 'album',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'track',
@@ -600,18 +635,13 @@ function pushtape_music_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '3',
-        ),
-        'full' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '12',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 12,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -629,65 +659,63 @@ function pushtape_music_field_default_fields() {
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'options',
+        'module' => 'entityreference',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'node_reference/autocomplete',
-          'size' => 60,
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
         ),
-        'type' => 'options_select',
+        'type' => 'entityreference_autocomplete',
         'weight' => '2',
       ),
     ),
   );
 
-  // Exported field: 'node-track-field_artist'
-  $fields['node-track-field_artist'] = array(
+  // Exported field: 'node-track-field_artist_term'
+  $fields['node-track-field_artist_term'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_artist',
+      'field_name' => 'field_artist_term',
       'foreign keys' => array(
-        'format' => array(
+        'tid' => array(
           'columns' => array(
-            'format' => 'format',
+            'tid' => 'tid',
           ),
-          'table' => 'filter_format',
+          'table' => 'taxonomy_term_data',
         ),
       ),
       'indexes' => array(
-        'format' => array(
-          0 => 'format',
+        'tid' => array(
+          0 => 'tid',
         ),
       ),
-      'module' => 'text',
+      'module' => 'taxonomy',
       'settings' => array(
-        'max_length' => '255',
+        'allowed_values' => array(
+          0 => array(
+            'vocabulary' => 'artist',
+            'parent' => '0',
+          ),
+        ),
       ),
-      'translatable' => '1',
-      'type' => 'text',
+      'translatable' => '0',
+      'type' => 'taxonomy_term_reference',
     ),
     'field_instance' => array(
       'bundle' => 'track',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => '(Leave blank to use album artist.)',
+      'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_default',
-          'weight' => '2',
-        ),
-        'full' => array(
           'label' => 'above',
-          'module' => 'text',
+          'module' => 'taxonomy',
           'settings' => array(),
-          'type' => 'text_default',
-          'weight' => '1',
+          'type' => 'taxonomy_term_reference_link',
+          'weight' => 11,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -697,21 +725,21 @@ function pushtape_music_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_artist',
+      'field_name' => 'field_artist_term',
       'label' => 'Artist',
       'required' => 0,
       'settings' => array(
-        'text_processing' => '0',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
-        'active' => 1,
-        'module' => 'text',
+        'active' => 0,
+        'module' => 'taxonomy',
         'settings' => array(
-          'size' => '60',
+          'autocomplete_path' => 'taxonomy/autocomplete',
+          'size' => 60,
         ),
-        'type' => 'text_textfield',
-        'weight' => '7',
+        'type' => 'taxonomy_autocomplete',
+        'weight' => '6',
       ),
     ),
   );
@@ -814,7 +842,94 @@ function pushtape_music_field_default_fields() {
           'progress_indicator' => 'throbber',
         ),
         'type' => 'image_image',
-        'weight' => '3',
+        'weight' => '1',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-track-field_audio'
+  $fields['node-track-field_audio'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_audio',
+      'foreign keys' => array(
+        'fid' => array(
+          'columns' => array(
+            'fid' => 'fid',
+          ),
+          'table' => 'file_managed',
+        ),
+      ),
+      'indexes' => array(
+        'fid' => array(
+          0 => 'fid',
+        ),
+      ),
+      'module' => 'file',
+      'settings' => array(
+        'display_default' => 0,
+        'display_field' => 0,
+        'uri_scheme' => 'private',
+      ),
+      'translatable' => '0',
+      'type' => 'file',
+    ),
+    'field_instance' => array(
+      'bundle' => 'track',
+      'deleted' => '0',
+      'description' => 'Upload or add audio from the media library.',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'file',
+          'settings' => array(),
+          'type' => 'file_default',
+          'weight' => 10,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_audio',
+      'label' => 'Audio',
+      'required' => 0,
+      'settings' => array(
+        'description_field' => 0,
+        'file_directory' => 'audio',
+        'file_extensions' => 'wmv mp3 wav mp4 m4a',
+        'max_filesize' => '',
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'media',
+        'settings' => array(
+          'allowed_schemes' => array(
+            'private' => 'private',
+            'public' => 'public',
+          ),
+          'allowed_types' => array(
+            'audio' => 0,
+            'default' => 0,
+            'image' => 'image',
+            'video' => 0,
+          ),
+          'browser_plugins' => array(
+            'library' => 0,
+            'media_default--media_browser_1' => 0,
+            'upload' => 'upload',
+          ),
+          'progress_indicator' => 'throbber',
+        ),
+        'type' => 'media_generic',
+        'weight' => '10',
       ),
     ),
   );
@@ -887,7 +1002,7 @@ function pushtape_music_field_default_fields() {
           'rows' => '2',
         ),
         'type' => 'text_textarea',
-        'weight' => '6',
+        'weight' => '5',
       ),
     ),
   );
@@ -965,7 +1080,7 @@ function pushtape_music_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '10',
+        'weight' => '9',
       ),
     ),
   );
@@ -1038,7 +1153,7 @@ function pushtape_music_field_default_fields() {
           'rows' => '3',
         ),
         'type' => 'text_textarea',
-        'weight' => '5',
+        'weight' => '4',
       ),
     ),
   );
@@ -1084,6 +1199,12 @@ function pushtape_music_field_default_fields() {
           'type' => 'text_default',
           'weight' => '8',
         ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
       ),
       'entity_type' => 'node',
       'field_name' => 'field_release_date',
@@ -1100,7 +1221,7 @@ function pushtape_music_field_default_fields() {
           'size' => '60',
         ),
         'type' => 'text_textfield',
-        'weight' => '8',
+        'weight' => '7',
       ),
     ),
   );
@@ -1180,27 +1301,29 @@ function pushtape_music_field_default_fields() {
           'size' => 60,
         ),
         'type' => 'taxonomy_autocomplete',
-        'weight' => '9',
+        'weight' => '8',
       ),
     ),
   );
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('(Leave blank to use album artist.)');
   t('(Leave blank to use album release date.)');
   t('Album');
   t('Album artwork');
   t('Album notes');
   t('Artist');
   t('Artwork');
+  t('Audio');
   t('Credits');
   t('License');
   t('Lyrics');
   t('Notes');
   t('Release date');
   t('Tags');
-  t('Tracklist');
+  t('Tracks');
+  t('Upload or add audio from the media library.');
+  t('artist');
 
   return $fields;
-}
+}
\ No newline at end of file
diff --git a/pushtape_music/pushtape_music.features.inc b/pushtape_music/pushtape_music.features.inc
index f918fc7..243b8d0 100644
--- a/pushtape_music/pushtape_music.features.inc
+++ b/pushtape_music/pushtape_music.features.inc
@@ -5,13 +5,17 @@
  */
 
 /**
+ * Implements hook_ctools_plugin_api().
+ */
+function pushtape_music_ctools_plugin_api() {
+  return array("version" => "1");
+}
+
+/**
  * Implements hook_views_api().
  */
 function pushtape_music_views_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "views" && $api == "views_default") {
-    return array("version" => "3.0");
-  }
+  return array("version" => "3.0");
 }
 
 /**
diff --git a/pushtape_music/pushtape_music.features.menu_links.inc b/pushtape_music/pushtape_music.features.menu_links.inc
deleted file mode 100644
index 252f279..0000000
--- a/pushtape_music/pushtape_music.features.menu_links.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * @file
- * pushtape_music.features.menu_links.inc
- */
-
-/**
- * Implements hook_menu_default_menu_links().
- */
-function pushtape_music_menu_default_menu_links() {
-  $menu_links = array();
-
-  // Exported menu link: main-menu:releases
-  $menu_links['main-menu:releases'] = array(
-    'menu_name' => 'main-menu',
-    'link_path' => 'releases',
-    'router_path' => 'releases',
-    'link_title' => 'Albums',
-    'options' => array(),
-    'module' => 'system',
-    'hidden' => '1',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-50',
-    'parent_path' => 'music',
-  );
-  // Exported menu link: management:node/add/track
-  $menu_links['management:node/add/track'] = array(
-    'menu_name' => 'management',
-    'link_path' => 'node/add/track',
-    'router_path' => 'node/add/track',
-    'link_title' => 'New Track',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'New track...',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-50',
-    'parent_path' => 'admin',
-  );
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Albums');
-  t('New Track');
-
-
-  return $menu_links;
-}
diff --git a/pushtape_music/pushtape_music.features.taxonomy.inc b/pushtape_music/pushtape_music.features.taxonomy.inc
index 1abeb6a..13f83a3 100644
--- a/pushtape_music/pushtape_music.features.taxonomy.inc
+++ b/pushtape_music/pushtape_music.features.taxonomy.inc
@@ -9,7 +9,30 @@
  */
 function pushtape_music_taxonomy_default_vocabularies() {
   return array(
-    'tags' => array(
+    'artist' => array(
+      'name' => 'Artist',
+      'machine_name' => 'artist',
+      'description' => '',
+      'hierarchy' => '0',
+      'module' => 'taxonomy',
+      'weight' => '0',
+      'rdf_mapping' => array(
+        'rdftype' => array(
+          0 => 'skos:ConceptScheme',
+        ),
+        'name' => array(
+          'predicates' => array(
+            0 => 'dc:title',
+          ),
+        ),
+        'description' => array(
+          'predicates' => array(
+            0 => 'rdfs:comment',
+          ),
+        ),
+      ),
+    ),
+      'tags' => array(
       'name' => 'Tags',
       'machine_name' => 'tags',
       'description' => 'Use tags to group articles on similar topics into categories.',
diff --git a/pushtape_music/pushtape_music.info b/pushtape_music/pushtape_music.info
index 7f35834..40191d0 100644
--- a/pushtape_music/pushtape_music.info
+++ b/pushtape_music/pushtape_music.info
@@ -1,25 +1,36 @@
+name = "pushtape_music"
+description = "Creates album and track content types and views."
 core = "7.x"
+package = "Features"
+php = "5.2.4"
+version = "7.x-2.0alpha8"
+project = "pushtape_music"
 dependencies[] = "block"
 dependencies[] = "features"
 dependencies[] = "image"
 dependencies[] = "list"
+dependencies[] = "media"
 dependencies[] = "menu"
-dependencies[] = "node_reference"
+dependencies[] = "entityreference"
 dependencies[] = "pathauto"
+dependencies[] = "strongarm"
 dependencies[] = "taxonomy"
 dependencies[] = "views"
-description = "Creates album and track content types and views."
+features[ctools][] = "strongarm:strongarm:1"
+features[ctools][] = "page_manager:pages_default:1"
 features[ctools][] = "views:views_default:3.0"
+features[ctools][] = "panelizer:panelizer:1"
 features[field][] = "node-album-body"
-features[field][] = "node-album-field_artist"
+features[field][] = "node-album-field_artist_term"
 features[field][] = "node-album-field_artwork"
 features[field][] = "node-album-field_release_date"
 features[field][] = "node-album-field_tags"
 features[field][] = "node-album-field_tracklist"
 features[field][] = "node-track-body"
 features[field][] = "node-track-field_album"
-features[field][] = "node-track-field_artist"
+features[field][] = "node-track-field_artist_term"
 features[field][] = "node-track-field_artwork"
+features[field][] = "node-track-field_audio"
 features[field][] = "node-track-field_credits"
 features[field][] = "node-track-field_license"
 features[field][] = "node-track-field_lyrics"
@@ -30,19 +41,12 @@ features[image][] = "artwork_large"
 features[image][] = "artwork_medium"
 features[image][] = "artwork_small"
 features[image][] = "artwork_thumbnail"
-features[menu_custom][] = "main-menu"
-features[menu_custom][] = "management"
-features[menu_links][] = "main-menu:releases"
-features[menu_links][] = "management:node/add/track"
 features[node][] = "album"
 features[node][] = "track"
+features[taxonomy][] = "artist"
 features[taxonomy][] = "tags"
 features[user_role][] = "artist"
 features[views_view][] = "albums"
 features[views_view][] = "releases"
 features[views_view][] = "tracks"
-name = "pushtape_music"
-package = "Features"
-php = "5.2.4"
-project = "pushtape_music"
-version = "7.x-1.0"
+project status url = "http://apps.rosenstrauch.com/fserver"
\ No newline at end of file
diff --git a/pushtape_music/pushtape_music.module b/pushtape_music/pushtape_music.module
index e55b2fb..56f449e 100644
--- a/pushtape_music/pushtape_music.module
+++ b/pushtape_music/pushtape_music.module
@@ -5,3 +5,44 @@
  */
 
 include_once('pushtape_music.features.inc');
+
+
+/**
+ * Implements hook_panelizer_default_types_alter()
+ */
+function pushtape_music_panelizer_defaults_alter(&$defaults) {
+  // Require the panels panelizer include from features since 
+  // features doesn't support hook_panelizer_defaults() correctly.
+  // See https://drupal.org/node/1427150 for more on that.
+  require_once('pushtape_music.panelizer.inc');
+  foreach(pushtape_music_panelizer_defaults() as $name => $default) {
+    $defaults[$name] = $default;
+  }
+}
+
+/**
+ * Implementation of hook_apps_app_info()
+ */
+function pushtape_music_apps_app_info() {
+  return array(
+    'demo content description' => 'add some tracks and terms',
+    'demo content module' => 'pushtape_music_democontent',
+    'configure form' => 'pushtape_music_configure_form',
+    // 'post install callback' => 'appname_app_post_install', // This will be called after the app is enabled intialy or of the app has been uninstalled
+    // 'status callback' => 'appname_app_status'
+  );
+}
+
+/** 
+ * App Configuration Form
+ */
+function pushtape_music_configure_form($form, &$form_state) {
+  $form = array();
+
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save'),
+  );
+
+   return $form;
+}
\ No newline at end of file
diff --git a/pushtape_music/pushtape_music.views_default.inc b/pushtape_music/pushtape_music.views_default.inc
index ce7eff4..01f8898 100644
--- a/pushtape_music/pushtape_music.views_default.inc
+++ b/pushtape_music/pushtape_music.views_default.inc
@@ -121,11 +121,11 @@ function pushtape_music_views_default_views() {
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
-  $handler->display->display_options['path'] = 'albums';
-  $handler->display->display_options['menu']['type'] = 'normal';
+  $handler->display->display_options['path'] = 'discography/albums';
   $handler->display->display_options['menu']['title'] = 'Albums';
   $handler->display->display_options['menu']['weight'] = '0';
   $handler->display->display_options['menu']['name'] = 'main-menu';
+  $handler->display->display_options['menu']['context'] = 0;
 
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block_1');
@@ -273,15 +273,15 @@ function pushtape_music_views_default_views() {
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
   $handler->display->display_options['filter_groups']['operator'] = 'OR';
   $handler->display->display_options['filter_groups']['groups'] = array(
-    0 => 'AND',
     1 => 'AND',
+    2 => 'AND',
   );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
@@ -290,13 +290,13 @@ function pushtape_music_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'album' => 'album',
   );
-  $handler->display->display_options['filters']['type']['group'] = 0;
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'node';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
   $handler->display->display_options['filters']['status_1']['value'] = '1';
-  $handler->display->display_options['filters']['status_1']['group'] = 1;
+  $handler->display->display_options['filters']['status_1']['group'] = 2;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -304,21 +304,21 @@ function pushtape_music_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'track' => 'track',
   );
-  $handler->display->display_options['filters']['type_1']['group'] = 1;
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
   /* Filter criterion: Content: Album (field_album) */
   $handler->display->display_options['filters']['field_album_nid']['id'] = 'field_album_nid';
   $handler->display->display_options['filters']['field_album_nid']['table'] = 'field_data_field_album';
   $handler->display->display_options['filters']['field_album_nid']['field'] = 'field_album_nid';
   $handler->display->display_options['filters']['field_album_nid']['operator'] = 'empty';
-  $handler->display->display_options['filters']['field_album_nid']['group'] = 1;
+  $handler->display->display_options['filters']['field_album_nid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
-  $handler->display->display_options['path'] = 'releases';
-  $handler->display->display_options['menu']['type'] = 'normal';
+  $handler->display->display_options['path'] = 'discography/releases';
   $handler->display->display_options['menu']['title'] = 'Releases';
   $handler->display->display_options['menu']['weight'] = '-1';
   $handler->display->display_options['menu']['name'] = 'main-menu';
+  $handler->display->display_options['menu']['context'] = 0;
 
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block_1');
@@ -373,6 +373,9 @@ function pushtape_music_views_default_views() {
   $handler->display->display_options['fields']['title']['hide_empty'] = 0;
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+
+  /* Display: Content pane */
+  $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1');
   $export['releases'] = $view;
 
   $view = new view;
@@ -490,11 +493,12 @@ function pushtape_music_views_default_views() {
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
-  $handler->display->display_options['path'] = 'tracks';
-  $handler->display->display_options['menu']['type'] = 'normal';
+  $handler->display->display_options['path'] = 'discography/tracks';
   $handler->display->display_options['menu']['title'] = 'Tracks';
   $handler->display->display_options['menu']['weight'] = '0';
   $handler->display->display_options['menu']['name'] = 'main-menu';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['tab_options']['weight'] = '0';
 
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block');