diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index f45b373..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="192.168.0.103:5555" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-02-15T16:07:20.126600Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8107757..09926a7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/circle_avatar.xml" value="0.2235" />
+        <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/ic_add_video_24.xml" value="0.2235" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/ic_change_category.xml" value="0.26403508771929823" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/ic_next_question.xml" value="0.26403508771929823" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/ic_profile_white_24dp.xml" value="0.2235" />
@@ -12,6 +13,7 @@
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/profile_property_shape.xml" value="0.2235" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/shape_background_category.xml" value="0.2890625" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/shape_category_name.xml" value="0.2574561403508772" />
+        <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/drawable/spinner_header.xml" value="0.208" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/activity_main.xml" value="0.22324561403508772" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/add_own_question_fragment.xml" value="0.1837719298245614" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/item_answer_variant.xml" value="0.1837719298245614" />
@@ -19,7 +21,7 @@
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/item_own_question_answer_variant.xml" value="0.35999999219721035" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/item_profile_property.xml" value="0.18157894736842106" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/item_spinner.xml" value="0.3236842105263158" />
-        <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/view_controller_add_own_question.xml" value="0.3236842105263158" />
+        <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/view_controller_add_own_question.xml" value="0.3106267029972752" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/view_controller_auth.xml" value="0.2267543859649123" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/view_controller_custom_player.xml" value="0.1570175438596491" />
         <entry key="..\:/AndroidProjects/SocialQuiz/app/src/main/res/layout/view_controller_profile.xml" value="0.3236842105263158" />
diff --git a/app/src/main/java/com/desiredsoftware/socialquiz/data/model/question/Answer.kt b/app/src/main/java/com/desiredsoftware/socialquiz/data/model/question/Answer.kt
index 32b0d4d..bbb851e 100644
--- a/app/src/main/java/com/desiredsoftware/socialquiz/data/model/question/Answer.kt
+++ b/app/src/main/java/com/desiredsoftware/socialquiz/data/model/question/Answer.kt
@@ -2,5 +2,6 @@ package com.desiredsoftware.socialquiz.data.model.question
 
 import java.io.Serializable
 
-class Answer(val answer: String,
-             val isCorrect: Boolean) : Serializable
\ No newline at end of file
+class Answer(
+    var answer: String,
+    var isCorrect: Boolean) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/desiredsoftware/socialquiz/presenter/question/AddOwnQuestionPresenter.kt b/app/src/main/java/com/desiredsoftware/socialquiz/presenter/question/AddOwnQuestionPresenter.kt
index 51ba100..e4a88a4 100644
--- a/app/src/main/java/com/desiredsoftware/socialquiz/presenter/question/AddOwnQuestionPresenter.kt
+++ b/app/src/main/java/com/desiredsoftware/socialquiz/presenter/question/AddOwnQuestionPresenter.kt
@@ -2,6 +2,7 @@ package com.desiredsoftware.socialquiz.presenter.question
 
 import android.content.Context
 import android.util.Log
+import com.desiredsoftware.socialquiz.R
 import com.desiredsoftware.socialquiz.data.model.category.Category
 import com.desiredsoftware.socialquiz.data.model.question.Answer
 import com.desiredsoftware.socialquiz.data.model.question.Question
@@ -34,7 +35,9 @@ class AddOwnQuestionPresenter @Inject constructor(
     var answers: MutableList<Answer> = MutableList(answersCount) {
         Answer("", false)
     }
-    var videoAbsolutePath: String = ""
+
+    // Path get from intent after recording
+    var videoAbsolutePath = String()
 
     fun initVideoUrl(videoAbsolutePath: String) {
         this.videoAbsolutePath = videoAbsolutePath
@@ -57,11 +60,10 @@ class AddOwnQuestionPresenter @Inject constructor(
         }
     }
 
-    fun uploadVideoToStorage(videoAbsolutePath: String) {
+    fun uploadVideoToStorage(videoFileName: String, videoAbsolutePath: String) {
         presenterScope.launch {
             var videoFullRef: StorageReference? = null
             firebaseUser?.let { user ->
-                val videoFileName = user.uid + ".mp4"
                 videoFullRef = firebaseStorageRef.child(VIDEO_PATH + videoFileName)
 
                 val stream = FileInputStream(File(videoAbsolutePath))
@@ -89,7 +91,6 @@ class AddOwnQuestionPresenter @Inject constructor(
                 questionId = firebaseUser.uid + unixTimestamp
                 // categoryId - should be set from spinner in controller already
                 answerVariants = answers
-
                 questionBody = firebaseUser.uid + unixTimestamp
                 questionAuthorUid = firebaseUser.uid
                 questionType = Question.Companion.QUESTION_TYPE.VIDEO
@@ -120,18 +121,32 @@ class AddOwnQuestionPresenter @Inject constructor(
             return false
         }
 
-        if (proposedQuestion.questionAuthorUid.isNullOrEmpty()) {
+        if (proposedQuestion.questionBody.isEmpty()) {
+            Log.d("checkQuestionContract", "questionBody is empty")
+            return false
+        }
+
+        if (proposedQuestion.questionAuthorUid.isEmpty()) {
             Log.d(
                 "checkQuestionContract",
                 "firebaseUser.uid = ${proposedQuestion.questionAuthorUid}"
             )
             return false
         }
+
+        // If this instruction runs then all properties is filled and probably, ok
+        Log.d("checkQuestionContract", "contract is OK!")
         return true
     }
 
     fun sendQuestion() {
-
+        if (videoAbsolutePath.isNotEmpty())
+        {
+            uploadVideoToStorage(proposedQuestion.questionBody, videoAbsolutePath)
+        }
+        else{
+            viewState.showError(context.resources.getString(R.string.video_not_choosen))
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/desiredsoftware/socialquiz/ui/question/adapters/OwnAnswerVariantsAdapter.kt b/app/src/main/java/com/desiredsoftware/socialquiz/ui/question/adapters/OwnAnswerVariantsAdapter.kt
index 6582f26..f121b30 100644
--- a/app/src/main/java/com/desiredsoftware/socialquiz/ui/question/adapters/OwnAnswerVariantsAdapter.kt
+++ b/app/src/main/java/com/desiredsoftware/socialquiz/ui/question/adapters/OwnAnswerVariantsAdapter.kt
@@ -3,18 +3,22 @@ package com.desiredsoftware.socialquiz.ui.question.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.RecyclerView
 import com.desiredsoftware.socialquiz.R
 import com.desiredsoftware.socialquiz.data.model.question.Answer
 
-class OwnAnswerVariantsAdapter(val answerVariants: MutableList<Answer>):
+class OwnAnswerVariantsAdapter(var answerVariants: MutableList<Answer>) :
     RecyclerView.Adapter<OwnAnswerVariantsAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_own_question_answer_variant, parent, false))
+        return ViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_own_question_answer_variant, parent, false)
+        )
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -25,13 +29,30 @@ class OwnAnswerVariantsAdapter(val answerVariants: MutableList<Answer>):
         return answerVariants.size
     }
 
-    class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
-        fun bind(answerVariant: Answer, position: Int){
-            val answerEditText = itemView.findViewById<AppCompatEditText>(R.id.answerVariantEditText)
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        fun bind(answerVariant: Answer, position: Int) {
+            val answerEditText =
+                itemView.findViewById<AppCompatEditText>(R.id.answerVariantEditText)
             val answerLabel = itemView.findViewById<AppCompatTextView>(R.id.answerLabel)
 
-            answerLabel.text = itemView.context.getString(R.string.answer_number, (position+1).toString())
+            val answerIsCorrectButton = itemView.findViewById<AppCompatButton>(R.id.isCorrectButton)
+
+            answerLabel.text =
+                itemView.context.getString(R.string.answer_number, (position + 1).toString())
             answerEditText.hint = itemView.context.getString(R.string.answer_variant_number)
+
+            answerEditText.addTextChangedListener {
+                answerVariant.answer = it.toString()
+            }
+
+            answerIsCorrectButton.setOnClickListener {
+                answerVariant.isCorrect = true
+                answerVariants.forEach { answer ->
+                    if (answer != answerVariant) {
+                        answer.isCorrect = false
+                    }
+                }
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4514f27..72a7797 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -39,4 +39,5 @@
     <string name="answer_number">Ответ %1$s</string>
     <string name="answer_variant_number">Напиши ответ</string>
     <string name="choose_your_video">Выбери свой видео вопрос</string>
+    <string name="video_not_choosen">Добавь видео, покажи себя ;)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 626ecb7..cedb1b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,4 +39,5 @@
     <string name="submit_for_approval">Submit for approval</string>
     <string name="answer_number">Answer %1$s</string>
     <string name="answer_variant_number">Enter answer here</string>
+    <string name="video_not_choosen">Video doesn\'t choosen</string>
 </resources>
\ No newline at end of file