diff --git a/src/App.vue b/src/App.vue
index 49f88fc..67f0f61 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,17 +1,17 @@
 <template>
   <div id="app">
-    <button @click="screenName = 'ArchivedScreen'" 
-            :disabled="screenName == 'ArchivedScreen'">
+    <button @click="screenName = 'MailScreenArchived'" 
+            :disabled="screenName == 'MailScreenArchived'">
       Archived View
     </button>
-    <button @click="screenName = 'InboxScreen'"
-            :disabled="screenName == 'InboxScreen'">
+    <button @click="screenName = 'MailScreenInbox'"
+            :disabled="screenName == 'MailScreenInbox'">
       Inbox View
     </button>
 
     <suspense>
       <template #default>
-        <component :is="screenName" />
+        <MailScreen :screenName="screenName" />
       </template>
       <template #fallback>
         <p>Loading...</p>
@@ -21,17 +21,15 @@
 </template>
 
 <script>
-import InboxScreen from './components/InboxScreen.vue';
-import ArchivedScreen from '@/components/ArchivedScreen.vue';
+import MailScreen from '@/components/MailScreen.vue';
 
 export default {
   name: 'App',
   components: {
-    InboxScreen,
-    ArchivedScreen
+    MailScreen
   },
-  setup(){
-    let screenName = 'InboxScreen';
+  setup(){  
+    let screenName = 'MailScreenInbox';
     return {screenName}
   }
 };
diff --git a/src/components/MailScreen.vue b/src/components/MailScreen.vue
new file mode 100644
index 0000000..8d43a7d
--- /dev/null
+++ b/src/components/MailScreen.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <component :is="screenName" :emails="emails" />
+  </div>
+</template>
+
+<script>
+  import MailScreenArchived from '@/components/MailScreenArchived.vue';
+  import MailScreenInbox from '@/components/MailScreenInbox.vue';
+  import { ref } from 'vue';
+
+  export default {
+    async setup(){
+      let response = await fetch('/api/emails');
+      let {emails} = await response.json();
+
+      emails = ref(emails);
+
+      return {emails};
+    },
+    components: {
+      MailScreenArchived,
+      MailScreenInbox
+    },
+    props: {
+      screenName: {
+        type: String,
+        required: true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/ArchivedScreen.vue b/src/components/MailScreenArchived.vue
similarity index 67%
rename from src/components/ArchivedScreen.vue
rename to src/components/MailScreenArchived.vue
index d10f4d9..6db6be9 100644
--- a/src/components/ArchivedScreen.vue
+++ b/src/components/MailScreenArchived.vue
@@ -10,16 +10,12 @@
   import MailTable from '@/components/MailTable.vue';
   import BulkActionBar from '@/components/BulkActionBar.vue';
 
-  import { computed, ref } from 'vue';
+  import { computed } from 'vue';
 
   export default {
-    async setup(){
-      let response = await fetch('/api/emails');
-      let {emails} = await response.json();
-
-      emails = ref(emails);
+    async setup({emails}){
       let archivedEmails = computed(() => {
-        return emails.value.filter(e => e.archived)
+        return emails.filter(e => e.archived)
       })
 
       return {archivedEmails}
diff --git a/src/components/InboxScreen.vue b/src/components/MailScreenInbox.vue
similarity index 66%
rename from src/components/InboxScreen.vue
rename to src/components/MailScreenInbox.vue
index c568ee2..4c3a95e 100644
--- a/src/components/InboxScreen.vue
+++ b/src/components/MailScreenInbox.vue
@@ -10,16 +10,12 @@
   import MailTable from '@/components/MailTable.vue';
   import BulkActionBar from '@/components/BulkActionBar.vue';
 
-  import { computed, ref } from 'vue';
+  import { computed } from 'vue';
 
   export default {
-    async setup(){
-      let response = await fetch('/api/emails');
-      let {emails} = await response.json();
-
-      emails = ref(emails);
+    async setup({emails}){
       let inboxEmails = computed(() => {
-        return emails.value.filter(e => !e.archived)
+        return emails.filter(e => !e.archived)
       })
 
       return {inboxEmails}