diff --git a/src/App.tsx b/src/App.tsx
index 2a6fbf9..f395013 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -18,7 +18,7 @@ function App() {
           <Route path='/quiz'
             element={<Quiz username={username}/>} />
         </Routes>
-        <Footer />
+        <Footer/>
       </Router>
     </div>
   );
diff --git a/src/Header/Header.tsx b/src/Header/Header.tsx
index f745c21..d97f856 100644
--- a/src/Header/Header.tsx
+++ b/src/Header/Header.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Hamburger from '../Hamburgerbutton/Hamburgerbutton';
 import './Header.scss'
 
-const logo = require('../ImageAssets/marsiokartlogo.jpg')
+const logo = require('../ImageAssets/marsiokartlogo.png')
 
 const Header: React.FC = () => {
 
diff --git a/src/ImageAssets/marsiokartlogo.png b/src/ImageAssets/marsiokartlogo.png
new file mode 100644
index 0000000..13e6010
Binary files /dev/null and b/src/ImageAssets/marsiokartlogo.png differ
diff --git a/src/QuestionDisplay/QuestionDisplay.tsx b/src/QuestionDisplay/QuestionDisplay.tsx
index fa8b236..4d48bcd 100644
--- a/src/QuestionDisplay/QuestionDisplay.tsx
+++ b/src/QuestionDisplay/QuestionDisplay.tsx
@@ -1,16 +1,17 @@
-import { getQuizQuestions } from "../getQuizQuestions/getQuizQuestions";
+import { Question } from "../getQuizQuestions/getQuizQuestions";
 
-export function QuestionDisplay() {
-    const questions = getQuizQuestions();
+interface QuestionDisplayProp{
+    question: Question;
+}
 
-    const question = questions[Math.floor(Math.random() * questions.length)];
+export function QuestionDisplay(props: QuestionDisplayProp) {
 
     return (
         <div>
-            {question.question} <br/>
-            <input type="radio" name="answer" id="radio-button1" value="0" /> {question.answers[0].answer} <br/>
-            <input type="radio" name="answer" id="radio-button2" value="1" /> {question.answers[1].answer} <br/>
-            <input type="radio" name="answer" id="radio-button3" value="2" /> {question.answers[2].answer} <br/>
+            {props.question.question} <br/>
+            <input type="radio" name="answer" id="radio-button1" value="0" /> {props.question.answers[0].answer} <br/>
+            <input type="radio" name="answer" id="radio-button2" value="1" /> {props.question.answers[1].answer} <br/>
+            <input type="radio" name="answer" id="radio-button3" value="2" /> {props.question.answers[2].answer} <br/>
         </div>
 
     )
diff --git a/src/Quiz/Quiz.tsx b/src/Quiz/Quiz.tsx
index 1d01719..a557080 100644
--- a/src/Quiz/Quiz.tsx
+++ b/src/Quiz/Quiz.tsx
@@ -1,14 +1,36 @@
 import { QuestionDisplay } from "../QuestionDisplay/QuestionDisplay"
+import { getQuizQuestions } from "../getQuizQuestions/getQuizQuestions"
+import { useState, useEffect } from "react";
 
 interface QuizProps{
     username:string;
 }
 
 export function Quiz (props:QuizProps) {
+    const listOfQuestions = getQuizQuestions();
+
+    const [currentIndex, setCurrentIndex] = useState<number>(0);
+    const [buttonText, setButtonText] = useState<string>("Next");
+    
+    const question = listOfQuestions[currentIndex]
+    
+    useEffect(() => {
+        if (currentIndex === listOfQuestions.length-1) {
+            setButtonText("Finish")
+        }
+    }, [currentIndex, listOfQuestions.length]);
+    
+    function updateCurrentIndex() {
+        if (currentIndex < listOfQuestions.length-1) {
+            setCurrentIndex(currentIndex + 1);
+        }
+    }
+    
     return (
         <div>
             User : {props.username}
-            <QuestionDisplay/>
+            <QuestionDisplay question={question}/>
+            <button type="submit" className="quiz-button" onClick={() => updateCurrentIndex()}>{buttonText}</button>
         </div>
     )
 }
\ No newline at end of file
diff --git a/src/getQuizQuestions/getQuizQuestions.tsx b/src/getQuizQuestions/getQuizQuestions.tsx
index 207f477..1a496b6 100644
--- a/src/getQuizQuestions/getQuizQuestions.tsx
+++ b/src/getQuizQuestions/getQuizQuestions.tsx
@@ -1,9 +1,9 @@
-type Answer = {
+export type Answer = {
     answer: string,
     isCorrect: boolean
 }
 
-type Question = {
+export type Question = {
     question: string,
     answers: Array<Answer>
 }