diff --git a/.idea/dictionaries/pln.xml b/.idea/dictionaries/pln.xml
new file mode 100644
index 0000000..601fdd4
--- /dev/null
+++ b/.idea/dictionaries/pln.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="pln">
+    <words>
+      <w>smsto</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index ea0833e..6ba94e1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,3 +1,12 @@
+# Nov 17
+- Refactor into BuddyListActivity + Details
+- Whitelist, add friends, eventually from contacts
+  - Reusing current landing as "select contact"? Unless better picker
+- Notifs
+- Fastlane
+
+- Deploy v0.1!
+
 # Feats
 
 - List friends
diff --git a/app/src/main/java/fr/plnech/dunbar/BuddyDetailActivity.kt b/app/src/main/java/fr/plnech/dunbar/FriendDetailActivity.kt
similarity index 98%
rename from app/src/main/java/fr/plnech/dunbar/BuddyDetailActivity.kt
rename to app/src/main/java/fr/plnech/dunbar/FriendDetailActivity.kt
index f2b9603..c30f1cf 100644
--- a/app/src/main/java/fr/plnech/dunbar/BuddyDetailActivity.kt
+++ b/app/src/main/java/fr/plnech/dunbar/FriendDetailActivity.kt
@@ -2,13 +2,13 @@ package fr.plnech.dunbar
 
 import android.content.Intent
 import android.os.Bundle
-import com.google.android.material.snackbar.Snackbar
-import androidx.appcompat.app.AppCompatActivity
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_buddy_detail.*
 
 /**
- * An activity representing a single Buddy detail screen. This
+ * An activity representing a single Friend detail screen. This
  * activity is only used on narrow width devices. On tablet-size devices,
  * item details are presented side-by-side with a list of items
  * in a [BuddyListActivity].
diff --git a/app/src/main/java/fr/plnech/dunbar/BuddyDetailFragment.kt b/app/src/main/java/fr/plnech/dunbar/FriendDetailFragment.kt
similarity index 96%
rename from app/src/main/java/fr/plnech/dunbar/BuddyDetailFragment.kt
rename to app/src/main/java/fr/plnech/dunbar/FriendDetailFragment.kt
index d7144c4..be535f3 100644
--- a/app/src/main/java/fr/plnech/dunbar/BuddyDetailFragment.kt
+++ b/app/src/main/java/fr/plnech/dunbar/FriendDetailFragment.kt
@@ -12,8 +12,8 @@ import kotlinx.android.synthetic.main.buddy_detail.view.*
 
 /**
  * A fragment representing a single Buddy detail screen.
- * This fragment is either contained in a [BuddyListActivity]
- * in two-pane mode (on tablets) or a [BuddyDetailActivity]
+ * This fragment is either contained in a [FriendListActivity]
+ * in two-pane mode (on tablets) or a [FriendDetailActivity]
  * on handsets.
  */
 class BuddyDetailFragment : Fragment() {
diff --git a/app/src/main/java/fr/plnech/dunbar/BuddyListActivity.kt b/app/src/main/java/fr/plnech/dunbar/FriendListActivity.kt
similarity index 100%
rename from app/src/main/java/fr/plnech/dunbar/BuddyListActivity.kt
rename to app/src/main/java/fr/plnech/dunbar/FriendListActivity.kt
diff --git a/app/src/main/java/fr/plnech/dunbar/data/Friends.kt b/app/src/main/java/fr/plnech/dunbar/data/Friends.kt
deleted file mode 100644
index 7e90ff0..0000000
--- a/app/src/main/java/fr/plnech/dunbar/data/Friends.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package fr.plnech.dunbar.data
-
-import android.content.ContentUris
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.provider.ContactsContract
-import fr.plnech.dunbar.model.Friend
-import java.io.IOException
-
diff --git a/app/src/main/java/fr/plnech/dunbar/ui/FriendsActivity.kt b/app/src/main/java/fr/plnech/dunbar/ui/ContactsActivity.kt
similarity index 100%
rename from app/src/main/java/fr/plnech/dunbar/ui/FriendsActivity.kt
rename to app/src/main/java/fr/plnech/dunbar/ui/ContactsActivity.kt
diff --git a/app/src/main/res/layout/activity_friends.xml b/app/src/main/res/layout/activity_contacts.xml
similarity index 96%
rename from app/src/main/res/layout/activity_friends.xml
rename to app/src/main/res/layout/activity_contacts.xml
index a4bf715..8ac531a 100644
--- a/app/src/main/res/layout/activity_friends.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.FriendsActivity">
+    tools:context=".ui.ContactsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_buddy_detail.xml b/app/src/main/res/layout/activity_friend_detail.xml
similarity index 97%
rename from app/src/main/res/layout/activity_buddy_detail.xml
rename to app/src/main/res/layout/activity_friend_detail.xml
index 4cdf42d..b1db4c5 100644
--- a/app/src/main/res/layout/activity_buddy_detail.xml
+++ b/app/src/main/res/layout/activity_friend_detail.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".BuddyDetailActivity"
+    tools:context=".FriendDetailActivity"
     tools:ignore="MergeRootFrame">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_buddy_list.xml b/app/src/main/res/layout/activity_friends_list.xml
similarity index 94%
rename from app/src/main/res/layout/activity_buddy_list.xml
rename to app/src/main/res/layout/activity_friends_list.xml
index 43cf072..dad967a 100644
--- a/app/src/main/res/layout/activity_buddy_list.xml
+++ b/app/src/main/res/layout/activity_friends_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".BuddyListActivity">
+    tools:context=".FriendListActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
@@ -27,7 +27,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <include layout="@layout/buddy_list" />
+        <include layout="@layout/friend_list" />
     </FrameLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/buddy_list.xml b/app/src/main/res/layout/buddy_list.xml
deleted file mode 100644
index 1a28090..0000000
--- a/app/src/main/res/layout/buddy_list.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView 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/buddy_list"
-    android:name="fr.plnech.dunbar.BuddyListFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    app:layoutManager="LinearLayoutManager"
-    tools:context=".BuddyListActivity"
-    tools:listitem="@layout/buddy_list_content" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/buddy_detail.xml b/app/src/main/res/layout/friend_detail.xml
similarity index 90%
rename from app/src/main/res/layout/buddy_detail.xml
rename to app/src/main/res/layout/friend_detail.xml
index ef9a0c2..d4374f4 100644
--- a/app/src/main/res/layout/buddy_detail.xml
+++ b/app/src/main/res/layout/friend_detail.xml
@@ -7,4 +7,4 @@
     android:layout_height="match_parent"
     android:padding="16dp"
     android:textIsSelectable="true"
-    tools:context=".BuddyDetailFragment" />
\ No newline at end of file
+    tools:context=".FriendDetailFragment" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/friend_list.xml b/app/src/main/res/layout/friend_list.xml
new file mode 100644
index 0000000..33c05c0
--- /dev/null
+++ b/app/src/main/res/layout/friend_list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".ui.ContactsActivity"
+    tools:showIn="@layout/activity_friends">
+
+    <TextView
+        android:id="@+id/welcomeTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toTopOf="@id/buddy_list"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:text="N friends on Dunbar" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/buddy_list"
+        android:name="fr.plnech.dunbar.BuddyListFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        app:layoutManager="LinearLayoutManager"
+        tools:context=".FriendListActivity"
+        tools:listitem="@layout/contact" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/buddy_list_content.xml b/app/src/main/res/layout/friend_list_content.xml
similarity index 100%
rename from app/src/main/res/layout/buddy_list_content.xml
rename to app/src/main/res/layout/friend_list_content.xml