diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 11128f1..70efde6 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index a720c42..c5670e1 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -4,13 +4,16 @@ import android.arch.lifecycle.ViewModelProviders
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
+import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import android.support.design.widget.Snackbar
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.app.AppCompatDelegate
 import android.text.method.LinkMovementMethod
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.ImageView
@@ -20,10 +23,30 @@ import java.util.regex.Pattern
 
 
 class MatchActivity : AppCompatActivity() {
+    var matchModel: MatchModel? = null
+    var textScore: android.widget.TextView? = null
+    var textService: android.widget.TextView? = null
+    var buttons: Array<Button> = emptyArray()
+    var imageViews: Array<ImageView?> = emptyArray()
+    var tts: TextToSpeech? = null
+    var stt: SpeechRecognizer? = null
+    var sttIntent: Intent? = null
 
     inner class WaitForTtsInit : TextToSpeech.OnInitListener {
         override fun onInit(status: Int) {
-            ttsSpeak()
+            updateUI()
+            matchModel?.apply{
+                if (sttEnabled) {
+                    speakText(
+                        getString(
+                            R.string.STT_hint,
+                            players[0].name,
+                            players[1].name
+                        ),
+                        TextToSpeech.QUEUE_ADD
+                    )
+                }
+            }
         }
     }
 
@@ -35,16 +58,108 @@ class MatchActivity : AppCompatActivity() {
         override fun onError(id: String) {}
     }
 
-    val REQ_CODE_SPEECH_INPUT = 1
-    val STT_RETRIES = 3
+    inner class SttListener : RecognitionListener {
+        val LOG_TAG: String = "SttListener"
 
-    var matchModel: MatchModel? = null
-    var textScore: android.widget.TextView? = null
-    var textService: android.widget.TextView? = null
-    var buttons: Array<Button> = emptyArray()
-    var imageViews: Array<ImageView?> = emptyArray()
-    var tts: TextToSpeech? = null
-    var numSttCancelled:Int = 0
+        override fun onBeginningOfSpeech() {
+            Log.i(LOG_TAG, "onBeginningOfSpeech")
+        }
+
+        override fun onBufferReceived(buffer: ByteArray?) {
+            Log.i(LOG_TAG, "onBufferReceived: $buffer");
+        }
+
+        override fun onEndOfSpeech() {
+            Log.i(LOG_TAG, "onEndOfSpeech")
+        }
+
+        override fun onError(errorCode: Int) {
+            val errorMessage: String = when(errorCode) {
+                SpeechRecognizer.ERROR_AUDIO -> "Audio recording error"
+                SpeechRecognizer.ERROR_CLIENT -> "Client side error"
+                SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS -> "Insufficient permissions"
+                SpeechRecognizer.ERROR_NETWORK -> "Network error"
+                SpeechRecognizer.ERROR_NETWORK_TIMEOUT -> "Network timeout"
+                SpeechRecognizer.ERROR_NO_MATCH -> "No match"
+                SpeechRecognizer.ERROR_RECOGNIZER_BUSY -> "RecognitionService busy"
+                SpeechRecognizer.ERROR_SERVER -> "error from server"
+                SpeechRecognizer.ERROR_SPEECH_TIMEOUT -> "No speech input"
+                else -> "Didn't understand, please try again."
+            }
+            Log.d(LOG_TAG, "FAILED $errorMessage")
+            launchStt()
+        }
+
+        override fun onEvent(arg0: Int, arg1: Bundle?) {
+            Log.i(LOG_TAG, "onEvent")
+        }
+
+        override fun onPartialResults(data: Bundle?) {
+            //Log.i(LOG_TAG, "onPartialResults")
+        }
+
+        override fun onReadyForSpeech(arg0: Bundle?) {
+            Log.i(LOG_TAG, "onReadyForSpeech")
+        }
+
+        override fun onResults(data: Bundle) {
+            Log.i(LOG_TAG, "onResults");
+            val results:ArrayList<String> = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
+            var understood = false
+
+            matchModel?.apply {
+                for (result in results) {
+                    for (player in players) {
+                        if (player.pattern?.matcher(result)?.find() == true) {
+                            understood = true
+                            updateScore(player)
+                            updateUI()
+                            break
+                        }
+                    }
+                    if (understood) break
+                }
+                if (!understood) {
+                    if (ttsEnabled) {
+                        speakText(getString(R.string.not_understood))
+                    }
+                    else {
+                        showText(R.string.not_understood)
+                    }
+                }
+            }
+            launchStt()
+        }
+
+        override fun onRmsChanged(rmsdB: Float) {
+            //Log.i(LOG_TAG, "onRmsChanged: $rmsdB")
+        }
+    }
+
+    fun showText(text: String, duration: Int = Snackbar.LENGTH_SHORT) {
+        Snackbar.make(
+            findViewById(R.id.coordinatorLayout),
+            text,
+            duration
+        ).show()
+    }
+
+    fun showText(textId: Int, duration: Int = Snackbar.LENGTH_SHORT) {
+        Snackbar.make(
+            findViewById(R.id.coordinatorLayout),
+            textId,
+            duration
+        ).show()
+    }
+
+    fun speakText(text: String, queueMode: Int = TextToSpeech.QUEUE_FLUSH) {
+        //stt?.stopListening()
+        tts?.speak(
+            text,
+            queueMode,
+            hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "TTS")
+        )
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -84,20 +199,55 @@ class MatchActivity : AppCompatActivity() {
                     for (player in players)
                         player.pattern = Pattern.compile(this@MatchActivity.getString(R.string.pattern, player.name))
                 }
-                Snackbar.make(
-                    findViewById(R.id.coordinatorLayout),
-                    R.string.button_hint,
-                    Snackbar.LENGTH_SHORT
-                ).show()
-            }
-            if (ttsEnabled) {
-                tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
-                if (sttEnabled) tts?.setOnUtteranceProgressListener(WaitForTtsSpeak())
+                if (ttsEnabled) {
+                    tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
+                }
+                if (sttEnabled) {
+                    stt = SpeechRecognizer.createSpeechRecognizer(this@MatchActivity).apply {
+                        setRecognitionListener(SttListener())
+                    }
+                    sttIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+                        putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+                        putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault().displayLanguage)
+                        putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 10)
+                        putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, this@MatchActivity.packageName)
+                    }
+                    if (ttsEnabled) {
+                        tts?.setOnUtteranceProgressListener(WaitForTtsSpeak())
+                    } else {
+                        matchModel?.apply {
+                            showText(
+                                getString(
+                                    R.string.STT_hint,
+                                    players[0].name,
+                                    players[1].name
+                                ),
+                                Snackbar.LENGTH_LONG
+                            )
+                        }
+                        launchStt()
+                    }
+                } else {
+                    showText(R.string.button_hint)
+                }
             }
         }
         updateUI()
     }
 
+    fun launchStt() {
+        matchModel?.apply {
+            if (sttEnabled and !matchFinished) {
+                try {
+                    stt?.startListening(sttIntent)
+                } catch (e: ActivityNotFoundException) {
+                    sttEnabled = false
+                    showText(R.string.STT_unavailable)
+                }
+            }
+        }
+    }
+
     override fun onBackPressed() {
         if (matchModel?.pointId == 0)
             super.onBackPressed()
@@ -134,139 +284,43 @@ class MatchActivity : AppCompatActivity() {
                 }
             )
 
-            if (ttsEnabled) ttsSpeak()
-
-            if (matchFinished) endMatch()
-            else if (sttEnabled and !ttsEnabled) launchStt()
-        }
-    }
-
-    fun ttsSpeak() {
-        matchModel?.apply {
             if (matchFinished) {
                 val (loser, winner) = players.sortedBy { it.score }
-                tts?.speak(
-                    getString(
-                        R.string.victory_speech,
-                        winner.name,
-                        winner.score,
-                        loser.score
-                    ),
-                    TextToSpeech.QUEUE_FLUSH,
-                    hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "Victory")
+                if (sttEnabled) {
+                    speakText(
+                        getString(
+                            R.string.victory_speech,
+                            winner.name,
+                            winner.score,
+                            loser.score
+                        )
+                    )
+                }
+                startActivity(
+                    Intent(this@MatchActivity, VictoryActivity::class.java).apply {
+                        putExtra("winnerName", winner.name)
+                        putExtra("player1Name", players[0].name)
+                        putExtra("player2Name", players[1].name)
+                        putExtra("player1Score", players[0].score)
+                        putExtra("player2Score", players[1].score)
+                    }
                 )
             } else {
-                var scoreSpeech: String = getString(
-                    R.string.update_score_speech,
-                    players[serviceSide].score,
-                    players[relaunchSide].score,
-                    players[serviceSide].name
-                )
-                if (matchPoint)
-                    scoreSpeech += getString(R.string.match_point)
-                tts?.speak(
-                    scoreSpeech,
-                    TextToSpeech.QUEUE_FLUSH,
-                    hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
-                )
-            }
-        }
-    }
-
-    fun launchStt() {
-        matchModel?.apply {
-            if (sttEnabled and !matchFinished) {
-                try {
-                    startActivityForResult(
-                        Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
-                            putExtra(
-                                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-                                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
-                            )
-                            putExtra(
-                                RecognizerIntent.EXTRA_LANGUAGE,
-                                Locale.getDefault().displayLanguage
-                            )
-                            putExtra(
-                                RecognizerIntent.EXTRA_PROMPT,
-                                getString(
-                                    R.string.STT_hint,
-                                    players[0].name,
-                                    players[1].name
-                                )
-                            )
-                            putExtra(
-                                RecognizerIntent.EXTRA_MAX_RESULTS, 10
-                            )
-                        },
-                        REQ_CODE_SPEECH_INPUT
+                if (ttsEnabled) {
+                    var scoreSpeech: String = getString(
+                        R.string.update_score_speech,
+                        players[serviceSide].score,
+                        players[relaunchSide].score,
+                        players[serviceSide].name
                     )
-                } catch (e: ActivityNotFoundException) {
-                    sttEnabled = false
-                    Snackbar.make(
-                        findViewById(R.id.coordinatorLayout),
-                        R.string.STT_unavailable,
-                        Snackbar.LENGTH_SHORT
-                    ).show()
+                    if (matchPoint)
+                        scoreSpeech += getString(R.string.match_point)
+                    speakText(scoreSpeech)
                 }
             }
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        when (requestCode) {
-            REQ_CODE_SPEECH_INPUT -> {
-                matchModel?.apply {
-                    if (resultCode == RESULT_OK && data != null) {
-                        var understood: Boolean = false
-                        val results: ArrayList<String> = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
-                        for (result in results) {
-                            for (player in players) {
-                                if (player.pattern?.matcher(result)?.find() == true) {
-                                    understood = true
-                                    updateScore(player)
-                                    updateUI()
-                                    break
-                                }
-                            }
-                            if (understood) break
-                        }
-                        if (!understood) {
-                            if (ttsEnabled) {
-                                tts?.speak(
-                                    getString(R.string.not_understood),
-                                    TextToSpeech.QUEUE_FLUSH,
-                                    hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
-                                )
-                            }
-                            else {
-                                Snackbar.make(
-                                    findViewById(R.id.coordinatorLayout),
-                                    R.string.not_understood,
-                                    Snackbar.LENGTH_SHORT
-                                ).show()
-                                launchStt()
-                            }
-                        }
-                    } else {
-                        numSttCancelled++
-                        if (numSttCancelled >= STT_RETRIES) {
-                            sttEnabled = false
-                            Snackbar.make(
-                                findViewById(R.id.coordinatorLayout),
-                                R.string.STT_disabled,
-                                Snackbar.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                }
-            }
-            else -> {
-            }
-        }
-    }
-
     fun updateScore(view: View) {
         matchModel?.apply {
             if (!matchFinished) {
@@ -280,18 +334,9 @@ class MatchActivity : AppCompatActivity() {
         }
     }
 
-    fun endMatch() {
-        matchModel?.let {
-            startActivity(
-                Intent(this, VictoryActivity::class.java).apply {
-                    putExtra("winnerName", it.players.maxBy{ player -> player.score }?.name)
-                    putExtra("player1Name", it.players[0].name)
-                    putExtra("player1Score", it.players[0].score)
-                    putExtra("player2Name", it.players[1].name)
-                    putExtra("player2Score", it.players[1].score)
-                }
-            )
-        }
+    override fun onStop() {
+        super.onStop()
+        tts?.shutdown()
+        stt?.destroy()
     }
-
 }
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttFragment.kt b/app/src/main/java/adrienmalin/pingpoints/SttFragment.kt
new file mode 100644
index 0000000..82da2a9
--- /dev/null
+++ b/app/src/main/java/adrienmalin/pingpoints/SttFragment.kt
@@ -0,0 +1,102 @@
+package adrienmalin.pingpoints
+
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Activities that contain this fragment must implement the
+ * [SttFragment.OnFragmentInteractionListener] interface
+ * to handle interaction events.
+ * Use the [SttFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ *
+ */
+class SttFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+    private var listener: OnFragmentInteractionListener? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_stt, container, false)
+    }
+
+    // TODO: Rename method, update argument and hook method into UI event
+    fun onButtonPressed(uri: Uri) {
+        listener?.onFragmentInteraction(uri)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is OnFragmentInteractionListener) {
+            listener = context
+        } else {
+            throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
+        }
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+        listener = null
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     *
+     *
+     * See the Android Training lesson [Communicating with Other Fragments]
+     * (http://developer.android.com/training/basics/fragments/communicating.html)
+     * for more information.
+     */
+    interface OnFragmentInteractionListener {
+        // TODO: Update argument type and name
+        fun onFragmentInteraction(uri: Uri)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment SttFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            SttFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
diff --git a/app/src/main/res/drawable/ic_stt.xml b/app/src/main/res/drawable/ic_stt.xml
new file mode 100644
index 0000000..ff00053
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stt.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,15c1.66,0 2.99,-1.34 2.99,-3L15,6c0,-1.66 -1.34,-3 -3,-3S9,4.34 9,6v6c0,1.66 1.34,3 3,3zM17.3,12c0,3 -2.54,5.1 -5.3,5.1S6.7,15 6.7,12L5,12c0,3.42 2.72,6.23 6,6.72L11,22h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_stt.xml b/app/src/main/res/layout/fragment_stt.xml
new file mode 100644
index 0000000..e9f5497
--- /dev/null
+++ b/app/src/main/res/layout/fragment_stt.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".SttFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/hello_blank_fragment"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 491f0e6..29caee9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -32,7 +32,7 @@
     <string name="share_subject">Match Ping Points : %s contre %s</string>
     <string name="share_message">"%s contre %s:\n%s a gagné par %d à %d\nPing Points est disponible sur Google Play\n "</string>
     <string name="match_point">Balle de match</string>
-    <string name="STT_hint">Dîtes : \"Point pour %s\"\nou \"Point pour %s\"</string>
+    <string name="STT_hint">Dîtes : \"Point pour %s\" ou \"Point pour %s\"</string>
     <string name="pattern">(?i:Point pour %s)</string>
     <string name="not_understood">Pouvez-vous répéter ?</string>
     <string name="STT_disabled">Reconnaissance vocale désactivée.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ae9d35..da0a85d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,9 +37,12 @@
     <string name="share_subject">Ping Points Match: %s vs. %s</string>
     <string name="share_message">%s vs. %s:\n%s won by %d to %d\nGet Ping Points on Google Play</string>
     <string name="match_point">Match point</string>
-    <string name="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
+    <string name="STT_hint">Say: \"Point for %s\" or \"Point for %s\"</string>
     <string name="pattern">(?i:Point for %s)</string>
     <string name="not_understood">Can you repeat, please?</string>
     <string name="score" translatable="false">%d - %d</string>
     <string name="STT_disabled">Voice recognition disabled.</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>