diff --git a/MultipleChoiceTrainer/Controllers/QuizController.cs b/MultipleChoiceTrainer/Controllers/QuizController.cs
index 690bec9..70e12bd 100644
--- a/MultipleChoiceTrainer/Controllers/QuizController.cs
+++ b/MultipleChoiceTrainer/Controllers/QuizController.cs
@@ -70,9 +70,20 @@ namespace MultipleChoiceTrainer.Controllers
 
         public IActionResult Quiz(QuizViewModel viewModel)
         {
+            var newViewModel = new QuizViewModel()
+            {
+                QuizType = viewModel.QuizType,
+                CurrentTypeId = viewModel.CurrentTypeId
+            }; 
 
+            if (string.IsNullOrEmpty(viewModel.CurrentQuestion.Text))
+            {
+                
+            }
 
-            return View("quiz", viewModel);
+            GetQuestion(newViewModel);
+
+            return View("quiz", newViewModel);
         }
     }
 }
\ No newline at end of file
diff --git a/MultipleChoiceTrainer/Models/DataModels/Evaluation.cs b/MultipleChoiceTrainer/Models/DataModels/Evaluation.cs
new file mode 100644
index 0000000..fa06565
--- /dev/null
+++ b/MultipleChoiceTrainer/Models/DataModels/Evaluation.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MultipleChoiceTrainer.Models.DataModels
+{
+    public class Evaluation
+    {
+        public bool Success => RightAnswer == GivenAnswer;
+        public bool RightAnswer { get; set; }
+        public bool GivenAnswer { get; set; }
+
+        public string Text { get; set; }
+    }
+}
diff --git a/MultipleChoiceTrainer/Models/QuizViewModel.cs b/MultipleChoiceTrainer/Models/QuizViewModel.cs
index 335b46a..ab126b4 100644
--- a/MultipleChoiceTrainer/Models/QuizViewModel.cs
+++ b/MultipleChoiceTrainer/Models/QuizViewModel.cs
@@ -20,6 +20,12 @@ namespace MultipleChoiceTrainer.Models
 
         public Question CurrentQuestion { get; set; }
 
-        public IList<Choice> Choices { get; set; } 
+        public IList<Choice> Choices { get; set; }
+
+
+        public bool HasPreviousResult => (Evaluations != null && Evaluations.Any());
+        public bool PassedPreviousQuestion => HasPreviousResult && !Evaluations.Any(e => !e.Success);
+        public string PreviousQuestion { get; set; }
+        public IList<Evaluation> Evaluations { get; set; }
     }
 }
diff --git a/MultipleChoiceTrainer/Views/Quiz/Quiz.cshtml b/MultipleChoiceTrainer/Views/Quiz/Quiz.cshtml
index 16d61de..05ebe52 100644
--- a/MultipleChoiceTrainer/Views/Quiz/Quiz.cshtml
+++ b/MultipleChoiceTrainer/Views/Quiz/Quiz.cshtml
@@ -6,20 +6,27 @@
 @using (Html.BeginForm("quiz", "quiz", FormMethod.Post))
 {
     <input asp-for="QuizType" type="hidden" />
+    <input asp-for="CurrentTypeId" type="hidden" />
+
+    <input asp-for="CurrentQuestion.Id" type="hidden" />
 
     <h4>Frage beantworten</h4>
     <p class="text-black-50">aus Lektion <i>@Model.CurrentQuestion.Section.Name</i>, Kurs <i>@Model.CurrentQuestion.Section.Category.Name</i></p>
     <hr />
     <p class="lead">
-        @Model.CurrentQuestion.Text
+        @Model.CurrentQuestion.Text <small class="text-black-50"> <i class="fas fa-info-circle" data-toggle="tooltip" title="(@Model.CurrentQuestion.Choices.Count(e => e.IsTrue) von @Model.Choices.Count())"></i></small>
     </p>
     @for(int i = 0; i < Model.Choices.Count(); i++)
     {
- 
+    
         <div class="form-check">
+            <input asp-for="@Model.Choices[i].Id" type="hidden" />
+            <input asp-for="@Model.Choices[i].Text" type="hidden" />
             <input asp-for="@Model.Choices[i].IsTrue" class="form-check-input" value="true" />
             <label asp-for="@Model.Choices[i].IsTrue" class="form-check-label">@Model.Choices[i].Text</label>
         </div>
     }
 
+    <button type="submit" class="btn btn-outline-warning">Prüfen</button>
+
 }
diff --git a/MultipleChoiceTrainer/Views/Shared/_Layout.cshtml b/MultipleChoiceTrainer/Views/Shared/_Layout.cshtml
index 427f066..9bc57cc 100644
--- a/MultipleChoiceTrainer/Views/Shared/_Layout.cshtml
+++ b/MultipleChoiceTrainer/Views/Shared/_Layout.cshtml
@@ -41,6 +41,11 @@
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
+    <script>
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+    </script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>