diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e69e1e3c..d0be0403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ MythTV Player An application for Android users to play MythTV Recordings and Videos
   ~ Copyright (c) 2015. Daniel Frey
   ~
@@ -16,10 +15,9 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<manifest
-    package="org.mythtv.android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.mythtv.android">
 
     <uses-sdk tools:overrideLibrary="android.support.v14.preference" />
 
@@ -66,12 +64,12 @@
     <application
         android:name=".presentation.AndroidApplication"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
         android:banner="@drawable/mythtv_logo"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/ic_mythtv"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
 
         <meta-data
             android:name="com.google.android.gms.version"
@@ -81,166 +79,138 @@
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
             android:value="org.mythtv.android.presentation.provider.CastOptionsProvider" />
 
-        <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
+        <meta-data
+            android:name="firebase_analytics_collection_enabled"
+            android:value="false" />
 
         <!-- App Activities -->
         <activity
-            android:name=".presentation.view.activity.phone.MainPhoneActivity"
-            android:clearTaskOnLaunch="true"
+            android:name=".presentation.view.activity.phone.NsdActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
-
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.NoActionBar">
             <intent-filter>
-
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-
             </intent-filter>
+        </activity>
+        <activity
+            android:name=".presentation.view.activity.phone.MainPhoneActivity"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
 
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.TitleInfoListActivity"
             android:label="@string/watch_recording"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.SeriesListActivity"
             android:label="@string/watch_recording"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.TitleInfoListActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.TitleInfoListActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.MediaItemDetailsActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SeriesListActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SeriesListActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.VideoListActivity"
             android:label="@string/watch_video"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.SettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.RecordingSettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SettingsActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SettingsActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.VideoSettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SettingsActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SettingsActivity" />
-
         </activity>
-
-        <activity
-            android:name=".presentation.view.activity.phone.SearchableActivity">
-
+        <activity android:name=".presentation.view.activity.phone.SearchableActivity">
             <intent-filter>
-
                 <action android:name="android.intent.action.SEARCH" />
-
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.LocalPlayerActivity"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|uiMode"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.NoActionBar">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.ExpandedControlsActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -248,112 +218,98 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
         </activity>
 
         <!-- AndroidTv activities -->
         <activity
-            android:name=".presentation.view.activity.tv.MainTvActivity"
-            android:theme="@style/Theme.Leanback"
-            android:configChanges="keyboard|keyboardHidden|navigation">
+            android:name=".presentation.view.activity.tv.NsdActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:theme="@style/Theme.Leanback">
             <intent-filter>
-
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-
             </intent-filter>
         </activity>
+        <activity
+            android:name=".presentation.view.activity.tv.MainTvActivity"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:theme="@style/Theme.Leanback">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
 
+                <!--<category android:name="android.intent.category.LEANBACK_LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
         <activity
             android:name=".presentation.view.activity.tv.RecordingsActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".presentation.view.activity.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.MediaItemDetailsActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.SettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.RecordingSettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.VideosActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.VideoCategoryActivity"
             android:parentActivityName=".presentation.view.activity.tv.VideosActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.VideosActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".view.activity.SearchableActivity" />
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.TvVideoSettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.SearchableActivity"
             android:theme="@style/Theme.Leanback">
-
             <intent-filter>
-
                 <action android:name="android.intent.action.SEARCH" />
-
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.PlaybackOverlayActivity"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
 
         <provider
-            android:name="org.mythtv.android.presentation.provider.MythtvSearchSuggestionProvider"
+            android:name=".presentation.provider.MythtvSearchSuggestionProvider"
             android:authorities="org.mythtv.android.presentation.provider.MythtvSearchSuggestionProvider"
             android:exported="false" />
 
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java b/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java
index 64d6ee2b..e90913f2 100644
--- a/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java
+++ b/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java
@@ -23,6 +23,7 @@
 import android.util.Log;
 
 import org.mythtv.android.domain.Media;
+import org.mythtv.android.presentation.view.activity.tv.MainTvActivity;
 import org.mythtv.android.presentation.view.activity.tv.RecordingsActivity;
 import org.mythtv.android.presentation.view.activity.tv.SearchableActivity;
 import org.mythtv.android.presentation.view.activity.tv.SettingsActivity;
@@ -50,6 +51,19 @@ public TvNavigator() {
         //empty
     }
 
+    public void navigateToMain( Context context ) {
+        Log.d( TAG, "navigateToMain : enter" );
+
+        if( null != context ) {
+
+            Intent intentToLaunch = MainTvActivity.getCallingIntent( context );
+            context.startActivity( intentToLaunch );
+
+        }
+
+        Log.d( TAG, "navigateToMain : exit" );
+    }
+
     public void navigateToRecordings( Context context ) {
         Log.d( TAG, "navigateToRecordings : enter" );
 
diff --git a/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java b/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java
index cc38ff43..de60dc39 100644
--- a/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java
+++ b/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java
@@ -57,7 +57,6 @@ public static Intent getCallingIntent( Context context ) {
         return callingIntent;
     }
 
-
     private MediaItemListFragment recentFragment;
     private EncoderListFragment encodersFragment;
     private MediaItemListFragment upcomingFragment;
diff --git a/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/NsdActivity.java b/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/NsdActivity.java
new file mode 100644
index 00000000..c1d58492
--- /dev/null
+++ b/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/NsdActivity.java
@@ -0,0 +1,45 @@
+package org.mythtv.android.presentation.view.activity.phone;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import org.mythtv.android.R;
+import org.mythtv.android.presentation.view.fragment.NsdFragment;
+
+public class NsdActivity extends AbstractBasePhoneActivity implements NsdFragment.BackendDiscoveryListerner {
+
+    private static final String TAG = NsdActivity.class.getSimpleName();
+
+    @Override
+    public int getLayoutResource() {
+
+        return R.layout.activity_phone_nsd;
+    }
+
+    @Override
+    protected void onCreate( Bundle savedInstanceState ) {
+        Log.d( TAG, "onCreate : enter" );
+        super.onCreate( savedInstanceState );
+
+        Log.d( TAG, "onCreate : exit" );
+    }
+
+    @Override
+    public void onDiscoveryComplete() {
+        Log.d( TAG, "onDiscoveryComplete : enter" );
+
+        navigator.navigateToHome( this );
+
+        Log.d( TAG, "onDiscoveryComplete : exit" );
+    }
+
+    @Override
+    public void onDiscoveryFailed() {
+        Log.d( TAG, "onDiscoveryFailed : enter" );
+
+        navigator.navigateToHome( this );
+
+        Log.d( TAG, "onDiscoveryFailed : exit" );
+    }
+
+}
diff --git a/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/MainTvActivity.java b/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/MainTvActivity.java
index 6ba58959..3f42a6ee 100644
--- a/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/MainTvActivity.java
+++ b/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/MainTvActivity.java
@@ -19,6 +19,7 @@
 package org.mythtv.android.presentation.view.activity.tv;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -47,6 +48,14 @@ public class MainTvActivity extends AbstractBaseTvActivity implements HasCompone
 
     private MediaComponent mediaComponent;
 
+    public static Intent getCallingIntent( Context context ) {
+
+        Intent callingIntent = new Intent( context, MainTvActivity.class );
+        callingIntent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
+
+        return callingIntent;
+    }
+
     @Override
     public int getLayoutResource() {
 
diff --git a/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/NsdActivity.java b/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/NsdActivity.java
new file mode 100644
index 00000000..79eaaa27
--- /dev/null
+++ b/app/src/main/java/org/mythtv/android/presentation/view/activity/tv/NsdActivity.java
@@ -0,0 +1,45 @@
+package org.mythtv.android.presentation.view.activity.tv;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import org.mythtv.android.R;
+import org.mythtv.android.presentation.view.fragment.NsdFragment;
+
+public class NsdActivity extends AbstractBaseTvActivity implements NsdFragment.BackendDiscoveryListerner {
+
+    private static final String TAG = NsdActivity.class.getSimpleName();
+
+    @Override
+    public int getLayoutResource() {
+
+        return R.layout.activity_tv_nsd;
+    }
+
+    @Override
+    protected void onCreate( Bundle savedInstanceState ) {
+        Log.d( TAG, "onCreate : enter" );
+        super.onCreate( savedInstanceState );
+
+        Log.d( TAG, "onCreate : exit" );
+    }
+
+    @Override
+    public void onDiscoveryComplete() {
+        Log.d( TAG, "onDiscoveryComplete : enter" );
+
+        navigator.navigateToMain( this );
+
+        Log.d( TAG, "onDiscoveryComplete : exit" );
+    }
+
+    @Override
+    public void onDiscoveryFailed() {
+        Log.d( TAG, "onDiscoveryFailed : enter" );
+
+        navigator.navigateToMain( this );
+
+        Log.d( TAG, "onDiscoveryFailed : exit" );
+    }
+
+}
diff --git a/app/src/main/java/org/mythtv/android/presentation/view/fragment/NsdFragment.java b/app/src/main/java/org/mythtv/android/presentation/view/fragment/NsdFragment.java
new file mode 100644
index 00000000..82d7b207
--- /dev/null
+++ b/app/src/main/java/org/mythtv/android/presentation/view/fragment/NsdFragment.java
@@ -0,0 +1,96 @@
+package org.mythtv.android.presentation.view.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.mythtv.android.R;
+import org.mythtv.android.domain.SettingsKeys;
+import org.mythtv.android.presentation.view.fragment.phone.AbstractBaseFragment;
+
+import it.ennova.zerxconf.ZeRXconf;
+import rx.Subscription;
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class NsdFragment extends AbstractBaseFragment {
+
+    private static final String TAG = NsdFragment.class.getSimpleName();
+
+    private SharedPreferences sharedPreferences;
+
+    public interface BackendDiscoveryListerner {
+
+        public void onDiscoveryComplete();
+
+        public void onDiscoveryFailed();
+    }
+
+    private BackendDiscoveryListerner listener;
+
+    public NsdFragment() {
+    }
+
+    @Override
+    public void onAttach( Context context ) {
+        super.onAttach( context );
+        Log.d( TAG, "onAttach : enter" );
+
+        Activity activity = getActivity();
+        if( activity instanceof BackendDiscoveryListerner) {
+            this.listener = (BackendDiscoveryListerner) activity;
+        }
+
+        Log.d( TAG, "onAttach : exit" );
+    }
+
+    @Override
+    public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState ) {
+
+        sharedPreferences = getSharedPreferencesComponent().sharedPreferences();
+
+        return inflater.inflate( R.layout.fragment_nsd, container, false );
+    }
+
+    @Override
+    public void onActivityCreated( @Nullable Bundle savedInstanceState ) {
+        Log.d( TAG, "onActivityCreated : enter" );
+        super.onActivityCreated( savedInstanceState );
+
+        lookupBackend();
+
+        Log.d( TAG, "onActivityCreated : exit" );
+    }
+
+    private void lookupBackend() {
+        Log.d( TAG, "lookupBackend : enter" );
+
+        Subscription s = ZeRXconf.startDiscovery( getActivity(), "_mythbackend._tcp." )
+                            .subscribe(
+                                    nsdInfo -> {
+                                        Log.i( TAG, "lookupBackend : " + nsdInfo.getAddress().getHostAddress() + ":" + nsdInfo.getServicePort() );
+                                        SharedPreferences.Editor editor = sharedPreferences.edit();
+                                        editor.putString( SettingsKeys.KEY_PREF_BACKEND_URL, nsdInfo.getAddress().getHostAddress() );
+                                        editor.putString( SettingsKeys.KEY_PREF_BACKEND_PORT, String.valueOf( nsdInfo.getServicePort() ) );
+                                        editor.apply();
+
+                                        listener.onDiscoveryComplete();
+                                    },
+                                    e -> {
+                                        Log.e( TAG, "lookupBackend : network discovery failed", e );
+
+                                        listener.onDiscoveryFailed();
+                                    }
+                            );
+
+        Log.d( TAG, "lookupBackend : exit" );
+    }
+
+}
diff --git a/app/src/main/res/layout-sw600dp/activity_tv_nsd.xml b/app/src/main/res/layout-sw600dp/activity_tv_nsd.xml
new file mode 100644
index 00000000..3108fa07
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/activity_tv_nsd.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ MythTV Player An application for Android users to play MythTV Recordings and Videos
+  ~ Copyright (c) 2015. Daniel Frey
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/outer_margin">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_phone_nsd.xml b/app/src/main/res/layout/activity_phone_nsd.xml
new file mode 100644
index 00000000..f652a4c9
--- /dev/null
+++ b/app/src/main/res/layout/activity_phone_nsd.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="org.mythtv.android.presentation.view.activity.phone.NsdActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_nsd" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_nsd.xml b/app/src/main/res/layout/content_nsd.xml
new file mode 100644
index 00000000..c42f7c35
--- /dev/null
+++ b/app/src/main/res/layout/content_nsd.xml
@@ -0,0 +1,9 @@
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment"
+    android:name="org.mythtv.android.presentation.view.fragment.NsdFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:layout="@layout/fragment_nsd" />
diff --git a/app/src/main/res/layout/fragment_nsd.xml b/app/src/main/res/layout/fragment_nsd.xml
new file mode 100644
index 00000000..1947f7a9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_nsd.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content_nsd"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="org.mythtv.android.presentation.view.fragment.NsdFragment"
+    tools:showIn="@layout/activity_phone_nsd">
+
+
+</RelativeLayout>
diff --git a/app/src/main/res/menu/menu_nsd.xml b/app/src/main/res/menu/menu_nsd.xml
new file mode 100644
index 00000000..63007bdf
--- /dev/null
+++ b/app/src/main/res/menu/menu_nsd.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.mythtv.android.presentation.view.activity.phone.NsdActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..7abc06d3
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1 @@
+<resources></resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 750e9f27..906f39bc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ MythTV Player An application for Android users to play MythTV Recordings and Videos
   ~ Copyright (c) 2015. Daniel Frey
   ~
@@ -31,5 +30,8 @@
     <dimen name="detail_backdrop_height">256dp</dimen>
 
     <dimen name="fab_margin">16dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b25572bd..c4cf4d8b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ MythTV Player An application for Android users to play MythTV Recordings and Videos
   ~ Copyright (c) 2015. Daniel Frey
   ~
@@ -211,5 +210,6 @@
     <string name="cd_image_view_button_4">image view button 4</string>
     <string name="cd_image_view_button_5">image view button 5</string>
     <string name="player_timer" translatable="false">0:00</string>
+    <string name="title_activity_nsd">NsdActivity</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..7abc06d3
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1 @@
+<resources></resources>