diff --git a/app/app.core.scss b/app/app.core.scss
index 1966da3..ec1a199 100644
--- a/app/app.core.scss
+++ b/app/app.core.scss
@@ -11,4 +11,4 @@
 
 @import "pages/grid/grid";
 
-@import "pages/list/list";
+@import "pages/questions/questions";
diff --git a/app/app.ts b/app/app.ts
index 69bd640..90ad235 100644
--- a/app/app.ts
+++ b/app/app.ts
@@ -1,7 +1,7 @@
 import {App, IonicApp, Platform} from 'ionic-framework/ionic';
 
 import {TeamPage} from './pages/team/team';
-import {ListPage} from './pages/list/list';
+import {QuestionsPage} from './pages/questions/questions';
 import {GridPage} from './pages/grid/grid';
 
 
@@ -18,7 +18,7 @@ class MyApp {
     // used for an example of ngFor and navigation
     this.pages = [
       { title: 'Team', component: TeamPage },
-      { title: 'Questions', component: ListPage },
+      { title: 'Questions', component: QuestionsPage },
       { title: 'Account', component: GridPage },
     ];
 
diff --git a/app/pages/list/list.html b/app/pages/list/list.html
deleted file mode 100644
index 7770edf..0000000
--- a/app/pages/list/list.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<ion-navbar *navbar>
-  <button menuToggle>
-    <icon menu></icon>
-  </button>
-  <ion-title>Lists</ion-title>
-</ion-navbar>
-
-<ion-content>
-  <ion-list>
-    <button ion-item *ngFor="#item of items" (click)="itemTapped($event, item)">
-      <icon [name]="item.icon" item-left></icon>
-      {{item.title}}
-      <div class="item-note" item-right>
-        {{item.note}}
-      </div>
-    </button>
-  </ion-list>
-  <div *ngIf="selectedItem" padding>
-    You navigated here from <b>{{selectedItem.title}}</b>
-  </div>
-</ion-content>
diff --git a/app/pages/list/list.ts b/app/pages/list/list.ts
deleted file mode 100644
index ba4fb2e..0000000
--- a/app/pages/list/list.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {IonicApp, Page, NavController, NavParams} from 'ionic-framework/ionic';
-
-
-@Page({
-  templateUrl: 'build/pages/list/list.html'
-})
-export class ListPage {
-  constructor(app: IonicApp, nav: NavController, navParams: NavParams) {
-    this.nav = nav;
-
-    // If we navigated to this page, we will have an item available as a nav param
-    this.selectedItem = navParams.get('item');
-
-    this.icons = ['flask', 'wifi', 'beer', 'football', 'basketball', 'paper-plane',
-    'american-football', 'boat', 'bluetooth', 'build'];
-
-    this.items = [];
-    for(let i = 1; i < 11; i++) {
-      this.items.push({
-        title: 'Item ' + i,
-        note: 'This is item #' + i,
-        icon: this.icons[Math.floor(Math.random() * this.icons.length)]
-      });
-    }
-  }
-
-  itemTapped(event, item) {
-    this.nav.push(ListPage, {
-      item: item
-    })
-  }
-}
diff --git a/app/pages/questions/questionadd.html b/app/pages/questions/questionadd.html
new file mode 100644
index 0000000..dd382c1
--- /dev/null
+++ b/app/pages/questions/questionadd.html
@@ -0,0 +1,16 @@
+<!-- Modal template appears when you actually load up the modal -->
+
+<ion-navbar *navbar>
+  <button menuToggle>
+    <icon menu></icon>
+  </button>
+  <ion-title>Add a Question</ion-title>
+</ion-navbar>
+
+<ion-content>
+<h2>I am a modal!</h2>
+
+<!-- Closing the modal does not require calling a function in your code anymore -->
+<button (click)="close()">Close</button>
+
+</ion-content>
diff --git a/app/pages/questions/questions.html b/app/pages/questions/questions.html
new file mode 100644
index 0000000..b46e279
--- /dev/null
+++ b/app/pages/questions/questions.html
@@ -0,0 +1,35 @@
+<ion-navbar *navbar>
+  <button menuToggle>
+    <icon menu></icon>
+  </button>
+  <ion-title>Questions</ion-title>
+</ion-navbar>
+
+<ion-content>
+<!-- Placeholder thumbnail list stuff -->
+  <ion-list>
+    <ion-list-header>Today</ion-list-header>
+
+      <ion-item (click)="itemTapped('selectedItem')">
+        <ion-thumbnail item-left>
+          <img src="http://placehold.it/150x150">
+        </ion-thumbnail>
+        <h2>Name 1</h2>
+        <H3>Angular 2 question</H3>
+        <p>Please teach me how to properly...</p>
+      </ion-item>
+
+      <ion-item (click)="itemTapped('selectedItem2')">
+        <ion-thumbnail item-left>
+          <img src="http://placehold.it/150x150">
+        </ion-thumbnail>
+        <h2>Name 2</h2>
+        <H3>Javascript question</H3>
+        <p>What's a good way to start up a...</p>
+      </ion-item>
+
+   </ion-list>
+
+   <!-- Opens modal, the openModal is a function -->
+  <button fab fab-right (click)="openModal()"><icon add></icon></button>
+</ion-content>
diff --git a/app/pages/list/list.scss b/app/pages/questions/questions.scss
similarity index 100%
rename from app/pages/list/list.scss
rename to app/pages/questions/questions.scss
diff --git a/app/pages/questions/questions.ts b/app/pages/questions/questions.ts
new file mode 100644
index 0000000..3201f94
--- /dev/null
+++ b/app/pages/questions/questions.ts
@@ -0,0 +1,37 @@
+import {IonicApp, Page, NavController, NavParams, Modal, Platform} from 'ionic-framework/ionic';
+import {QuestionsDetail} from './questionsdetail';
+
+@Page({
+  templateUrl: 'build/pages/questions/questions.html'
+})
+export class QuestionsPage {
+
+  constructor(app: IonicApp, nav: NavController, navParams: NavParams, modal: Modal) {
+    this.nav = nav;
+    this.modal = modal;
+  }
+
+  //once clicked, opens up the new screen, take note of the QuestionsDetail
+  itemTapped(item) {
+    this.nav.push(QuestionsDetail)
+    console.log("switch screen");
+  }
+
+  //opens the modal, placed here because we are still in the questions page
+  openModal(item){
+    this.modal.open(questionModal);
+    console.log("Open Modal");
+  }
+
+}
+
+
+//Modal code, the templateUrl directs to the modal template
+@Page({
+  templateUrl: 'build/pages/questions/questionadd.html'
+})
+class questionModal{
+
+  constructor() {
+  }
+}
diff --git a/app/pages/questions/questionsdetail.html b/app/pages/questions/questionsdetail.html
new file mode 100644
index 0000000..fdb3586
--- /dev/null
+++ b/app/pages/questions/questionsdetail.html
@@ -0,0 +1,10 @@
+<ion-navbar *navbar>
+  <button menuToggle>
+    <icon menu></icon>
+  </button>
+  <ion-title>Questions Detail</ion-title>
+</ion-navbar>
+
+<ion-content>
+Hello world
+</ion-content>
diff --git a/app/pages/questions/questionsdetail.scss b/app/pages/questions/questionsdetail.scss
new file mode 100644
index 0000000..e69de29
diff --git a/app/pages/questions/questionsdetail.ts b/app/pages/questions/questionsdetail.ts
new file mode 100644
index 0000000..0289e42
--- /dev/null
+++ b/app/pages/questions/questionsdetail.ts
@@ -0,0 +1,12 @@
+import {IonicApp, Page, NavController, NavParams} from 'ionic-framework/ionic';
+
+
+@Page({
+  templateUrl: 'build/pages/questions/questionsdetail.html'
+})
+export class QuestionsDetail {
+  constructor(app: IonicApp, nav: NavController, navParams: NavParams) {
+    
+  }
+
+}