diff --git a/android-app/.idea/.name b/android-app/.idea/.name
index 7280d21..6bacb7f 100644
--- a/android-app/.idea/.name
+++ b/android-app/.idea/.name
@@ -1 +1 @@
-HackU3
\ No newline at end of file
+android-app
\ No newline at end of file
diff --git a/android-app/.idea/gradle.xml b/android-app/.idea/gradle.xml
index 736c7b5..2cbb09b 100644
--- a/android-app/.idea/gradle.xml
+++ b/android-app/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.2.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/android-app/.idea/vcs.xml b/android-app/.idea/vcs.xml
index def6a6a..21cbaa6 100644
--- a/android-app/.idea/vcs.xml
+++ b/android-app/.idea/vcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
 
diff --git a/android-app/android-app.iml b/android-app/android-app.iml
index 0bb6048..5550340 100644
--- a/android-app/android-app.iml
+++ b/android-app/android-app.iml
@@ -7,7 +7,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/android-app/app/app.iml b/android-app/app/app.iml
index cf5f566..91b4018 100644
--- a/android-app/app/app.iml
+++ b/android-app/app/app.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@@ -85,32 +84,24 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="google-oauth-client-1.19.0" level="project" />
+    <orderEntry type="library" exported="" name="droidicon-0.1.6" level="project" />
+    <orderEntry type="library" exported="" name="sugar-1.3" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
-    <orderEntry type="library" exported="" name="sugar-1.3" level="project" />
-    <orderEntry type="library" exported="" name="jackson-core-2.1.3" level="project" />
-    <orderEntry type="library" exported="" name="Parse-1.7.1" level="project" />
     <orderEntry type="library" exported="" name="gridlayout-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Parse-1.7.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="aspectjrt-1.7.4" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="hugo-annotations-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="guava-jdk5-13.0" level="project" />
-    <orderEntry type="library" exported="" name="google-http-client-jackson2-1.19.0" level="project" />
-    <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
-    <orderEntry type="library" exported="" name="droidicon-0.1.6" level="project" />
-    <orderEntry type="library" exported="" name="google-api-client-1.19.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="hugo-runtime-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="google-api-services-youtube-v3-rev126-1.19.1" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="aspectjrt-1.7.4" level="project" />
     <orderEntry type="library" exported="" name="support-v13-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="google-http-client-1.19.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="hugo-annotations-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="supertoasts-1.3.4" level="project" />
+    <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
   </component>
 </module>
 
diff --git a/android-app/app/build.gradle b/android-app/app/build.gradle
index bcbcefa..e67c0e8 100644
--- a/android-app/app/build.gradle
+++ b/android-app/app/build.gradle
@@ -14,6 +14,9 @@ apply plugin: 'hugo'
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
+    dexOptions {
+        jumboMode true
+    }
 
     defaultConfig {
         applicationId "com.mateoj.hacku3"
@@ -27,6 +30,10 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 }
 
@@ -48,8 +55,7 @@ dependencies {
     compile 'com.squareup.picasso:picasso:2.5.0'
     compile 'com.squareup.retrofit:retrofit:1.9.0'
     compile 'com.github.satyan:sugar:1.3'
-    compile 'com.github.johnpersano:supertoasts:1.3.4@aar'
     compile 'com.github.theDazzler:droidicon:0.1.6@aar'
-    compile 'com.google.apis:google-api-services-youtube:v3-rev126-1.19.1'
     compile files('libs/Parse-1.7.1.jar')
+    compile 'com.parse.bolts:bolts-android:1.+'
 }
diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml
index 85c2edc..23218e9 100644
--- a/android-app/app/src/main/AndroidManifest.xml
+++ b/android-app/app/src/main/AndroidManifest.xml
@@ -6,11 +6,14 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name=".MyApp"
         android:theme="@style/AppTheme"
         tools:replace="android:icon " >
         <activity
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/Assessment.java b/android-app/app/src/main/java/com/mateoj/hacku3/Assessment.java
new file mode 100644
index 0000000..001f0e2
--- /dev/null
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/Assessment.java
@@ -0,0 +1,108 @@
+package com.mateoj.hacku3;
+
+import com.mateoj.hacku3.models.Question;
+import com.mateoj.hacku3.models.Topic;
+import com.mateoj.hacku3.models.Video;
+
+import java.util.List;
+
+/**
+ * Created by jose on 2/12/15.
+ */
+public class Assessment {
+    public enum Mode{
+        Practice,
+        ForReals
+    }
+
+    private static Assessment currentAssessment;
+
+    public static Assessment getCurrentAssessment() {
+        if( currentAssessment == null) {
+            currentAssessment = new Assessment();
+        }
+
+        return currentAssessment;
+    }
+
+    List<Question> questionsAnswered;
+
+    List<Video> videos;
+
+    Mode currentMode;
+
+    Topic topic;
+
+
+    /**
+     * Gets topic.
+     *
+     * @return Value of topic.
+     */
+    public Topic getTopic() {
+        return topic;
+    }
+
+    /**
+     * Sets new topic.
+     *
+     * @param topic New value of topic.
+     */
+    public void setTopic(Topic topic) {
+        this.topic = topic;
+    }
+
+    /**
+     * Gets questionsAnswered.
+     *
+     * @return Value of questionsAnswered.
+     */
+    public List<Question> getQuestionsAnswered() {
+        return questionsAnswered;
+    }
+
+    /**
+     * Sets new videos.
+     *
+     * @param videos New value of videos.
+     */
+    public void setVideos(List<Video> videos) {
+        this.videos = videos;
+    }
+
+    /**
+     * Gets videos.
+     *
+     * @return Value of videos.
+     */
+    public List<Video> getVideos() {
+        return videos;
+    }
+
+    /**
+     * Sets new questionsAnswered.
+     *
+     * @param questionsAnswered New value of questionsAnswered.
+     */
+    public void setQuestionsAnswered(List<Question> questionsAnswered) {
+        this.questionsAnswered = questionsAnswered;
+    }
+
+    /**
+     * Sets new currentMode.
+     *
+     * @param currentMode New value of currentMode.
+     */
+    public void setCurrentMode(Mode currentMode) {
+        this.currentMode = currentMode;
+    }
+
+    /**
+     * Gets currentMode.
+     *
+     * @return Value of currentMode.
+     */
+    public Mode getCurrentMode() {
+        return currentMode;
+    }
+}
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/MainActivity.java b/android-app/app/src/main/java/com/mateoj/hacku3/MainActivity.java
index 65a5363..ea630fe 100644
--- a/android-app/app/src/main/java/com/mateoj/hacku3/MainActivity.java
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/MainActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.CardView;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -10,6 +11,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.AlphaAnimation;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -78,23 +80,66 @@ public ViewHolder(View itemView) {
             }
         }
 
+        private void fade(View outgoing, View incoming) {
+            AlphaAnimation fadeOut = new AlphaAnimation(1, 0);
+            AlphaAnimation fadeIn = new AlphaAnimation(0, 1);
+            fadeIn.setDuration(500);
+            fadeOut.setDuration(500);
+            outgoing.setAnimation(fadeOut);
+            incoming.setAnimation(fadeIn);
+            outgoing.setVisibility(View.INVISIBLE);
+            incoming.setVisibility(View.VISIBLE);
+        }
+
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.category_row, parent, false);
+            final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.category_row, parent, false);
             final ViewHolder viewHolder = new ViewHolder(view);
-            view.setOnClickListener(new View.OnClickListener() {
+            final CardView topicSelection = (CardView) view.findViewById(R.id.topicSelection);
+            topicSelection.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Topic topic = allCategories.get(viewHolder.getPosition());
-                    Intent intent = new Intent(MainActivity.this, QuestionActivity.class);
-                    intent.putExtra("categoryId", topic.getId());
-                    intent.putExtra("categoryName", topic.getName());
-                    startActivity(intent);
+                    final CardView modeSelection = (CardView) view.findViewById(R.id.modeSelection);
+                    fade(topicSelection, modeSelection);
+                    modeSelection.findViewById(R.id.dismissModeSelection).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            fade(modeSelection, topicSelection);
+                        }
+                    });
+                    modeSelection.findViewById(R.id.assessmentButton).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            fade(modeSelection, topicSelection);
+                            Assessment.getCurrentAssessment().setCurrentMode(Assessment.Mode.ForReals);
+                            Assessment.getCurrentAssessment().setTopic(items.get(viewHolder.getPosition()));
+                            startAssessment();
+                        }
+                    });
+                    modeSelection.findViewById(R.id.practiceButton).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            fade(modeSelection, topicSelection);
+                            Assessment.getCurrentAssessment().setCurrentMode(Assessment.Mode.Practice);
+                            Assessment.getCurrentAssessment().setTopic(items.get(viewHolder.getPosition()));
+                            startAssessment();
+                        }
+                    });
+//                    Topic topic = allCategories.get(viewHolder.getPosition());
+//                    Intent intent = new Intent(MainActivity.this, QuestionActivity.class);
+//                    intent.putExtra("categoryId", topic.getId());
+//                    intent.putExtra("categoryName", topic.getName());
+//                    startActivity(intent);
                 }
             });
             return viewHolder;
         }
 
+        private void startAssessment() {
+            Intent intent = new Intent(MainActivity.this, QuestionActivity.class);
+            startActivity(intent);
+        }
+
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
            Topic topic = items.get(position);
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/MyApp.java b/android-app/app/src/main/java/com/mateoj/hacku3/MyApp.java
new file mode 100644
index 0000000..a80f6b7
--- /dev/null
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/MyApp.java
@@ -0,0 +1,20 @@
+package com.mateoj.hacku3;
+
+import android.app.Application;
+
+import com.parse.Parse;
+
+/**
+ * Created by jose on 2/12/15.
+ */
+public class MyApp extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // Enable Local Datastore.
+        Parse.enableLocalDatastore(this);
+
+        Parse.initialize(this, "1szB5VAWP1Zy3XQ8soea34thR6L1QdugCBLLTmHw", "2bTcQGBP6u64ylYQmC58eQoK0C7RHKpjFRLxp0q9");
+
+    }
+}
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/QuestionActivity.java b/android-app/app/src/main/java/com/mateoj/hacku3/QuestionActivity.java
index b26ee4a..13ac3c5 100644
--- a/android-app/app/src/main/java/com/mateoj/hacku3/QuestionActivity.java
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/QuestionActivity.java
@@ -1,17 +1,21 @@
 package com.mateoj.hacku3;
 
+import android.app.ProgressDialog;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.hardware.Camera;
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.CountDownTimer;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.MediaController;
 import android.widget.TextView;
 import android.widget.VideoView;
@@ -19,6 +23,7 @@
 import com.mateoj.hacku3.models.Question;
 
 import java.io.File;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -30,66 +35,80 @@
 
 
 public class QuestionActivity extends ActionBarActivity {
-    private int topicId;
     private List<Question> questionList = new ArrayList<>();
     private static int CAPTURE_VIDEO_ACTIVITY_RESULT = 200;
     private int currentQuestionIndex = 0;
     private TextView questionDescription;
-    private Button practiceButton;
-    private Button assesmentButton;
-    private Button recordButton;
+    private TextView recordButton;
     private VideoView videoView;
-    private Mode currentMode;
-    private Camera camera;
+    private Camera mCamera;
     private CameraPreview cameraPreview;
     public static final int MEDIA_TYPE_IMAGE = 1;
     public static final int MEDIA_TYPE_VIDEO = 2;
+    private TextView countDown;
+    ProgressDialog progressDialog;
+    MediaRecorder mMediaRecorder;
+    private boolean isRecording = false;
 
-    public enum Mode{
-        Assesment,
-        Practice
-    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_question);
+        mCamera = getCameraInstance();
+        cameraPreview = new CameraPreview(this, mCamera);
+        FrameLayout preview = (FrameLayout) findViewById(R.id.videoPreview);
+        preview.addView(cameraPreview);
+
+        mMediaRecorder = new MediaRecorder();
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setTitle("Loading...");
+        progressDialog.show();
         questionDescription = (TextView) findViewById(R.id.questionDescription);
-        practiceButton = (Button) findViewById(R.id.practiceButton);
-        recordButton = (Button) findViewById(R.id.recordButton);
+        recordButton = (TextView) findViewById(R.id.recordButton);
         videoView = (VideoView) findViewById(R.id.answerVideo);
+        countDown = (TextView) findViewById(R.id.countDown);
         MediaController mediaController = new MediaController(this);
         mediaController.setAnchorView(videoView);
         videoView.setMediaController(mediaController);
+        if( Assessment.getCurrentAssessment().getTopic() == null) {
+            throw new IllegalStateException("The topic has not been set");
+        }
+
 
-//        camera = getCameraInstance();
-//        if( camera != null) {
-//            cameraPreview = new CameraPreview(this, camera);
+//        mCamera = getCameraInstance();
+//        if( mCamera != null) {
+//            cameraPreview = new CameraPreview(this, mCamera);
 //            FrameLayout previewLayout = (FrameLayout) findViewById(R.id.videoPreview);
 //            previewLayout.addView(cameraPreview);
 //        }
 
-        if( getIntent().hasExtra("categoryId"))
-            topicId = getIntent().getIntExtra("categoryId", 0);
-
         recordButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startRecording();
             }
         });
-        practiceButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                beginPractice();
-            }
-        });
 
+        if( Assessment.getCurrentAssessment().currentMode == null)
+            Assessment.getCurrentAssessment().currentMode = Assessment.Mode.Practice;
 
-        IntervuService.getInstance().getQuestions("getallquestions", topicId, new Callback<List<Question>>() {
+        IntervuService.getInstance().getQuestions("getallquestions", Assessment.getCurrentAssessment().getTopic().getId(), new Callback<List<Question>>() {
             @Override
             public void success(List<Question> questions, Response response) {
                 questionList = questions;
                 Log.d("Questions", questions.toString());
+                progressDialog.dismiss();
+                findViewById(R.id.startButton).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                        if( Assessment.getCurrentAssessment().currentMode == Assessment.Mode.Practice)
+                            beginPractice();
+                        else if( Assessment.getCurrentAssessment().currentMode == Assessment.Mode.ForReals)
+                            beginAssessment();
+                    }
+                });
             }
 
             @Override
@@ -119,20 +138,41 @@ public static Camera getCameraInstance(){
         return cam;
     }
     private void startRecording(){
-        Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
-        intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, .4);
-        startActivityForResult(intent, CAPTURE_VIDEO_ACTIVITY_RESULT);
-//        camera.unlock();
-//        MediaRecorder mediaRecorder = new MediaRecorder();
-//        mediaRecorder.setCamera(camera);
-//        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
-//        mediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-//        mediaRecorder.setProfile(CamcorderProfile.get(CamcorderProfile.QUALITY_LOW));
-//        mediaRecorder.setOutputFile(getOutputMediaFile(MEDIA_TYPE_VIDEO).toString());
-        //mediaRecorder.setPreviewDisplay(cameraPreview);
+//        Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+//        intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, .4);
+//        startActivityForResult(intent, CAPTURE_VIDEO_ACTIVITY_RESULT);
+        if (isRecording) {
+            // stop recording and release camera
+            mMediaRecorder.stop();  // stop the recording
+            releaseMediaRecorder(); // release the MediaRecorder object
+            mCamera.lock();         // take camera access back from MediaRecorder
+
+            // inform the user that recording has stopped
+            setCaptureButtonText("Capture");
+            isRecording = false;
+        } else {
+            // initialize video camera
+            if (prepareVideoRecorder()) {
+                // Camera is available and unlocked, MediaRecorder is prepared,
+                // now you can start recording
+                mMediaRecorder.start();
+
+                // inform the user that recording has started
+                setCaptureButtonText("Stop");
+                isRecording = true;
+            } else {
+                // prepare didn't work, release the camera
+                releaseMediaRecorder();
+                // inform user
+            }
+        }
 
     }
 
+    private void setCaptureButtonText(String text) {
+        recordButton.setText(text);
+    }
+
     /** Create a File for saving an image or video */
     private static File getOutputMediaFile(int type){
         // To be safe, you should check that the SDCard is mounted
@@ -176,18 +216,30 @@ private static Uri getOutputMediaFileUri(int type){
 
     private void setQuestion(Question question) {
         questionDescription.setText(question.getQuestion());
+        new CountDownTimer(15 * 1000, 1000) {
+
+            public void onTick(long millisUntilFinished) {
+                countDown.setText("" + millisUntilFinished / 1000);
+                if( millisUntilFinished / 1000 <= 5){
+                    countDown.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+                }
+            }
+
+            public void onFinish() {
+                countDown.setText("Recording...");
+                startRecording();
+            }
+        }.start();
 
     }
 
     private void beginPractice() {
         begin();
-        currentMode = Mode.Practice;
         setCurrentQuestionIndex(0);
     }
 
     private void beginAssessment() {
         begin();
-        currentMode = Mode.Assesment;
         setCurrentQuestionIndex(0);
     }
 
@@ -196,14 +248,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if( requestCode == CAPTURE_VIDEO_ACTIVITY_RESULT) {
             if( resultCode == RESULT_OK) {
                 videoView.setVideoURI(data.getData());
-                
+
                 videoView.getDuration();
             }
         }
     }
 
     private void begin(){
-        findViewById(R.id.modeButtons).setVisibility(View.GONE);
+        findViewById(R.id.readyInfo).setVisibility(View.INVISIBLE);
         findViewById(R.id.questionInfo).setVisibility(View.VISIBLE);
     }
 
@@ -234,4 +286,71 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
+    /** Check if this device has a camera */
+    private boolean checkCameraHardware() {
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)){
+            // this device has a camera
+            return true;
+        } else {
+            // no camera on this device
+            return false;
+        }
+    }
+
+    private boolean prepareVideoRecorder(){
+
+        // Step 1: Unlock and set camera to MediaRecorder
+        mCamera.unlock();
+        mMediaRecorder.setCamera(mCamera);
+
+        // Step 2: Set sources
+        mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+
+        // Step 3: Set a CamcorderProfile (requires API Level 8 or higher)
+        mMediaRecorder.setProfile(CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH));
+
+        // Step 4: Set output file
+        mMediaRecorder.setOutputFile(getOutputMediaFile(MEDIA_TYPE_VIDEO).toString());
+
+        // Step 5: Set the preview output
+        mMediaRecorder.setPreviewDisplay(cameraPreview.getHolder().getSurface());
+
+        // Step 6: Prepare configured MediaRecorder
+        try {
+            mMediaRecorder.prepare();
+        } catch (IllegalStateException e) {
+            Log.d("Camera", "IllegalStateException preparing MediaRecorder: " + e.getMessage());
+            releaseMediaRecorder();
+            return false;
+        } catch (IOException e) {
+            Log.d("Camera", "IOException preparing MediaRecorder: " + e.getMessage());
+            releaseMediaRecorder();
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected void onPause() {
+        super.onPause();
+        releaseMediaRecorder();       // if you are using MediaRecorder, release it first
+        releaseCamera();              // release the camera immediately on pause event
+    }
+
+    private void releaseMediaRecorder(){
+        if (mMediaRecorder != null) {
+            mMediaRecorder.reset();   // clear recorder configuration
+            mMediaRecorder.release(); // release the recorder object
+            mMediaRecorder = null;
+            mCamera.lock();           // lock camera for later use
+        }
+    }
+
+    private void releaseCamera(){
+        if (mCamera != null){
+            mCamera.release();        // release the camera for other applications
+            mCamera = null;
+        }
+    }
+
 }
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/models/Review.java b/android-app/app/src/main/java/com/mateoj/hacku3/models/Review.java
new file mode 100644
index 0000000..156d588
--- /dev/null
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/models/Review.java
@@ -0,0 +1,9 @@
+package com.mateoj.hacku3.models;
+
+/**
+ * Created by Bliss on 2/13/2015.
+ */
+public class Review {
+    
+
+}
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/models/Video.java b/android-app/app/src/main/java/com/mateoj/hacku3/models/Video.java
index 48af6d4..38f2dde 100644
--- a/android-app/app/src/main/java/com/mateoj/hacku3/models/Video.java
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/models/Video.java
@@ -6,3 +6,5 @@
 public class Video {
     private String localUri;
 }
+
+
diff --git a/android-app/app/src/main/java/com/mateoj/hacku3/models/answer.java b/android-app/app/src/main/java/com/mateoj/hacku3/models/answer.java
new file mode 100644
index 0000000..3297be6
--- /dev/null
+++ b/android-app/app/src/main/java/com/mateoj/hacku3/models/answer.java
@@ -0,0 +1,73 @@
+package com.mateoj.hacku3.models;
+
+import java.util.List;
+
+/**
+ * Created by Bliss on 2/12/2015.
+ */
+class Answer {
+    private int id;
+    private  int userID;
+    private String videoLink;
+    private String feedBack;
+    private int questionID;
+    private int assessmentID;
+
+    private static List<Answer> answerList;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getUserID() {
+        return userID;
+    }
+
+    public void setUserID(int userID) {
+        this.userID = userID;
+    }
+
+    public String getVideoLink() {
+        return videoLink;
+    }
+
+    public void setVideoLink(String videoLink) {
+        this.videoLink = videoLink;
+    }
+
+    public String getFeedBack() {
+        return feedBack;
+    }
+
+    public void setFeedBack(String feedBack) {
+        this.feedBack = feedBack;
+    }
+
+    public int getQuestionID() {
+        return questionID;
+    }
+
+    public void setQuestionID(int questionID) {
+        this.questionID = questionID;
+    }
+
+    public int getAssessmentID() {
+        return assessmentID;
+    }
+
+    public void setAssessmentID(int assessmentID) {
+        this.assessmentID = assessmentID;
+    }
+
+    public static List<Answer> getAnswerList() {
+        return answerList;
+    }
+
+    public static void setAnswerList(List<Answer> answerList) {
+        Answer.answerList = answerList;
+    }
+}
diff --git a/android-app/app/src/main/res/layout/activity_main.xml b/android-app/app/src/main/res/layout/activity_main.xml
index 90907de..8f66b29 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:tools="http://schemas.android.com/tools"
+                xmlns:droidicon="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -14,4 +15,6 @@
         android:layout_alignParentLeft="true"
         android:id="@+id/categoriesList"/>
 
+
+
 </RelativeLayout>
diff --git a/android-app/app/src/main/res/layout/activity_question.xml b/android-app/app/src/main/res/layout/activity_question.xml
index 2fc03b7..01ac916 100644
--- a/android-app/app/src/main/res/layout/activity_question.xml
+++ b/android-app/app/src/main/res/layout/activity_question.xml
@@ -1,5 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:tools="http://schemas.android.com/tools"
+                xmlns:droidicon="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -16,6 +17,10 @@
         <TextView
             android:id="@+id/questionDescription"
             android:layout_width="wrap_content"
+            android:textAppearance="?android:textAppearanceLarge"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:layout_height="wrap_content"/>
         <VideoView
             android:layout_width="match_parent"
@@ -29,28 +34,38 @@
             android:id="@+id/videoPreview"
             android:layout_weight="1"
             android:layout_height="0dp"/>
-        <Button
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="30dp"
+            android:gravity="center"
+            android:id="@+id/countDown"
+            android:textColor="@android:color/holo_green_dark"/>
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Record"
+            android:textSize="20dp"
+            android:gravity="center"
             android:id="@+id/recordButton"/>
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
-        android:orientation="vertical"
-        android:id="@+id/modeButtons"
-        android:gravity="center"
-        android:layout_height="match_parent">
-        <Button
+        android:layout_height="match_parent"
+        android:id="@+id/readyInfo"
+        android:orientation="vertical">
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Practice"
-            android:id="@+id/practiceButton"/>
+            android:gravity="center"
+            android:textColor="@color/theme_default_primary"
+            android:textSize="50dp"
+            android:text="READY?"/>
         <Button
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Assessment"
-            android:id="@+id/assessmentButton"/>
-    </LinearLayout>
+            android:id="@+id/startButton"
+            android:text="Start"/>
+        </LinearLayout>
 
 </RelativeLayout>
diff --git a/android-app/app/src/main/res/layout/activity_review.xml b/android-app/app/src/main/res/layout/activity_review.xml
new file mode 100644
index 0000000..c62ca2e
--- /dev/null
+++ b/android-app/app/src/main/res/layout/activity_review.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:droidicon="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="280sp"
+        android:text="@string/reviewQuestion"
+        android:id="@+id/reviewQuestion"
+        android:layout_gravity="center_horizontal" />
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Review Video"
+        android:id="@+id/reviewVideo"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="280sp"
+        android:text="@string/reviewQuestion"
+        android:id="@+id/reviewReview"
+        android:layout_gravity="center_horizontal" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+    <VideoView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/videoReview"
+        android:layout_gravity="center_horizontal" />
+    <MediaController
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/mediaController"
+            android:layout_gravity="center_horizontal" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/category_row.xml b/android-app/app/src/main/res/layout/category_row.xml
index d617bb8..b2308cb 100644
--- a/android-app/app/src/main/res/layout/category_row.xml
+++ b/android-app/app/src/main/res/layout/category_row.xml
@@ -1,11 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
-    <TextView
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:droidicon="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/categoryText"/>
+        android:layout_alignParentTop="true"
+        android:id="@+id/topicSelection"
+        android:padding="@dimen/activity_vertical_margin"
+        android:layout_height="200dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_margin="@dimen/activity_vertical_margin"
+            tools:text="General Interview"
+            android:textAppearance="?android:textAppearanceMedium"
+            android:layout_gravity="center"
+            android:id="@+id/categoryText"/>
+    </android.support.v7.widget.CardView>
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:padding="@dimen/activity_vertical_margin"
+        android:layout_height="200dp"
+        android:id="@+id/modeSelection"
+        android:layout_alignParentTop="true"
+        android:visibility="gone">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content">
+            <com.thedazzler.droidicon.badges.DroidiconBadge
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                droidicon:db_icon_color="@color/twitter_blue"
+                droidicon:db_icon="fa-undo"
+                android:layout_gravity="right"
+                android:id="@+id/dismissModeSelection"
+                android:src="@android:drawable/ic_delete"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/practiceButton"
+                android:gravity="center"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:layout_gravity="center"
+                android:text="Practice"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/assessmentButton"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="Assessment"/>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/menu/menu_main.xml b/android-app/app/src/main/res/menu/menu_main.xml
index a459e0a..24b3ab5 100644
--- a/android-app/app/src/main/res/menu/menu_main.xml
+++ b/android-app/app/src/main/res/menu/menu_main.xml
@@ -6,4 +6,9 @@
           android:title="@string/action_settings"
           android:orderInCategory="100"
           app:showAsAction="never"/>
+    <item android:id="@+id/action_gallery"
+        android:title="Video Gallery"
+        android:orderInCategory="99"
+        app:showAsAction="never"/>
+
 </menu>
diff --git a/android-app/app/src/main/res/values-w820dp/strings.xml b/android-app/app/src/main/res/values-w820dp/strings.xml
new file mode 100644
index 0000000..768b801
--- /dev/null
+++ b/android-app/app/src/main/res/values-w820dp/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="reviewQuestion">New Text</string>
+</resources>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/values/strings.xml b/android-app/app/src/main/res/values/strings.xml
index 80c8678..95e9c0d 100644
--- a/android-app/app/src/main/res/values/strings.xml
+++ b/android-app/app/src/main/res/values/strings.xml
@@ -4,4 +4,5 @@
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_question">QuestionActivity</string>
+    <string name="reviewQuestion">New Text</string>
 </resources>
diff --git a/android-app/app/src/main/res/values/styles.xml b/android-app/app/src/main/res/values/styles.xml
index 766ab99..7d14432 100644
--- a/android-app/app/src/main/res/values/styles.xml
+++ b/android-app/app/src/main/res/values/styles.xml
@@ -1,8 +1,58 @@
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+    <resources>
+        <color name="theme_default_primary_light">#FF7043</color>
+        <color name="theme_default_primary">#FF5722</color>
+        <color name="theme_default_primary_dark">#E64A19</color>
+        <color name="theme_default_accent">#999999</color>
+        <color name="theme_default_accent_light">#cccccc</color>
+        <color name="theme_default_accent_dark">#666666</color>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-    </style>
+        <color name="theme_background">#f2f2f2</color>
 
-</resources>
+        <declare-styleable name="DWSAppTheme">
+            <attr name="actionBarIconColor" format="color" />
+        </declare-styleable>
+
+        <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+            <item name="colorPrimary">@color/theme_default_primary</item>
+            <item name="colorPrimaryDark">@color/theme_default_primary_dark</item>
+            <item name="colorAccent">@color/theme_default_accent</item>
+            <item name="colorControlHighlight">@color/theme_default_accent_light</item>
+            <item name="colorControlNormal">@color/theme_default_accent_light</item>
+            <item name="colorControlActivated">@color/theme_default_accent_light</item>
+            <item name="actionBarIconColor">#fff</item>
+        </style>
+
+
+        <style name="MainTheme" parent="AppTheme">
+            <item name="actionBarTheme">@style/MainActionBarThemeOverlay</item>
+            <item name="actionBarStyle">@style/MainActionBar</item>
+            <item name="windowActionBarOverlay">false</item>
+        </style>
+
+        <style name="MainActionBar" parent="Widget.AppCompat.ActionBar">
+            <item name="background">?colorPrimaryDark</item>
+            <item name="displayOptions">showTitle|homeAsUp</item>
+            <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_mtrl_am_alpha</item>
+            <item name="titleTextStyle">@style/MainThemeActionBarTitleTextStyle</item>
+        </style>
+
+        <style name="MainActionBarThemeOverlay" parent="">
+            <item name="colorControlNormal">?actionBarIconColor</item>
+            <item name="colorControlHighlight">@color/theme_default_accent_light</item>
+        </style>
+
+        <style name="MainThemeActionBarTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        </style>
+
+        <style name="DetailTheme" parent="MainTheme">
+            <item name="actionBarStyle">@style/DetailActionBar</item>
+            <item name="windowActionBarOverlay">false</item>
+        </style>
+
+        <style name="DetailActionBar" parent="Widget.AppCompat.Light.ActionBar">
+            <item name="background">@null</item>
+            <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_mtrl_am_alpha</item>
+            <item name="displayOptions">homeAsUp</item>
+        </style>
+    </resources>