diff --git a/server/pom.xml b/server/pom.xml
index 7329a47..a66bf14 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -106,6 +106,21 @@
             <artifactId>firebase-admin</artifactId>
             <version>9.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
 
         <!-- Logback Classic -->
         <!-- <dependency>
diff --git a/server/src/main/java/all_java_code.txt b/server/src/main/java/all_java_code.txt
index e734fd4..954a00c 100644
--- a/server/src/main/java/all_java_code.txt
+++ b/server/src/main/java/all_java_code.txt
@@ -66,26 +66,164 @@ public class ButtonInteraction implements Serializable {
  
 package org.vaadin.numerosity;
 
-import org.vaadin.numerosity.Featureset.AppFunctions.bank;
-import org.vaadin.numerosity.Featureset.AppFunctions.rush;
-import org.vaadin.numerosity.Featureset.AppFunctions.zen;
-
+import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.H1;
 import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEvent;
+import com.vaadin.flow.router.HasUrlParameter;
+import com.vaadin.flow.router.OptionalParameter;
+import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouterLink;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.vaadin.numerosity.Featureset.AppFunctions.bank;
+import org.vaadin.numerosity.Featureset.AppFunctions.rush;
+import org.vaadin.numerosity.Featureset.AppFunctions.zen;
+import org.vaadin.numerosity.Subsystems.DataPlotter;
+import org.vaadin.numerosity.Subsystems.DatabaseHandler;
+import org.vaadin.numerosity.Subsystems.FirebaseHandler;
+import org.vaadin.numerosity.Subsystems.LocalDatabaseHandler;
+import org.vaadin.numerosity.Subsystems.QuestionContentLoader;
+import org.vaadin.numerosity.Subsystems.ResponseHandler;
+import org.vaadin.numerosity.entity.User;
+import org.vaadin.numerosity.repository.UserRepository;
+
+import java.util.List;
+import java.util.Map;
 
-public class MainView extends VerticalLayout {
+@Route("main")
+public class MainView extends VerticalLayout implements HasUrlParameter<String> {
+
+    private String userId;
+    private Div contentArea = new Div();
+    private H2 welcomeMessage = new H2();
+    private final FirebaseHandler firebaseService;
+    private final QuestionContentLoader questionLoader;
+    private final LocalDatabaseHandler localDbHandler;
+    private final DatabaseHandler DbHandler;
+    private final DataPlotter dataPlotter;
+    private Map<String, Object> questionJson;
+    private ResponseHandler responseTracker;
+
+    // Login/Registration Components
+    private TextField usernameField = new TextField("Username");
+    private PasswordField passwordField = new PasswordField("Password");
+    private Button loginButton = new Button("Login");
+    private Button registerButton = new Button("Register");
+    @Autowired
+    private UserRepository userRepository;
+
+
+    @Autowired
+    public MainView(FirebaseHandler firebaseService, QuestionContentLoader questionLoader, UserRepository userRepository) {
+        this.firebaseService = firebaseService;
+        this.questionLoader = questionLoader;
+        this.localDbHandler = null;
+        this.DbHandler = null;
+        this.dataPlotter = new DataPlotter();
+        this.userRepository = userRepository; // Inject UserRepository
 
-    public MainView() {
         // Header
         H1 header = new H1("Numerosity");
         header.getStyle().set("text-align", "center");
         add(header);
 
-        // Navigation Links
+        // Initialize Login/Registration form
+        VerticalLayout loginForm = createLoginForm();
+        add(loginForm);
+
+        // Navigation Links - initially hidden
+        Div navigationBar = createNavigationBar();
+        navigationBar.setVisible(false);
+
+        contentArea.getStyle().set("margin-left", "220px");
+        contentArea.getStyle().set("padding", "20px");
+        contentArea.add(welcomeMessage);
+        contentArea.setVisible(false);
+
+        HorizontalLayout layout = new HorizontalLayout(navigationBar, contentArea);
+        layout.setSizeFull();
+
+        add(layout);
+    }
+
+    private VerticalLayout createLoginForm() {
+        VerticalLayout loginForm = new VerticalLayout();
+
+        loginButton.addClickListener(e -> {
+            String username = usernameField.getValue();
+            String password = passwordField.getValue();
+
+            User user = userRepository.findByUsername(username);
+
+            if (user != null && user.getPassword().equals(password)) {
+                // Authentication successful
+                this.userId = username;
+                welcomeMessage.setText("Welcome to Numerosity, " + userId + "!");
+                loadQuestionsAndInitialize();
+                //Show main view
+                showMainView();
+            } else {
+                Notification.show("Invalid username or password.");
+            }
+        });
+
+        registerButton.addClickListener(e -> {
+            String username = usernameField.getValue();
+            String password = passwordField.getValue();
+
+            if (username == null || username.isEmpty() || password == null || password.isEmpty()) {
+                Notification.show("Username and password cannot be empty.");
+                return;
+            }
+            if (userRepository.findByUsername(username) != null) {
+                Notification.show("Username already exists.");
+                return;
+            }
+
+            User newUser = new User(username, password);
+            userRepository.save(newUser);
+            Notification.show("Registration successful. Please log in.");
+        });
+
+        loginForm.add(usernameField, passwordField, loginButton, registerButton);
+        return loginForm;
+    }
+
+    private void showMainView() {
+        // Find the navigation bar and content area in the MainView
+        HorizontalLayout layout = (HorizontalLayout) this.getChildren()
+                .filter(component -> component instanceof HorizontalLayout)
+                .findFirst()
+                .orElse(null);
+
+        if (layout != null) {
+            Div navigationBar = (Div) layout.getChildren()
+                    .filter(component -> component instanceof Div)
+                    .findFirst()
+                    .orElse(null);
+
+            // Set visibility of the navigation bar
+            if (navigationBar != null) {
+                navigationBar.setVisible(true);
+            }
+
+            // Set visibility of the content area
+            contentArea.setVisible(true);
+
+            // Hide the login form
+            getChildren().filter(component -> component instanceof VerticalLayout)
+                    .findFirst()
+                    .ifPresent(component -> component.setVisible(false));
+        }
+    }
+
+    private Div createNavigationBar() {
         Div navigationBar = new Div();
         navigationBar.getStyle().set("width", "200px");
         navigationBar.getStyle().set("border-right", "1px solid black");
@@ -97,20 +235,70 @@ public class MainView extends VerticalLayout {
         RouterLink dailyLink = new RouterLink("Daily", zen.class);
 
         navigationBar.add(practiceLink, rushLink, dailyLink);
+        return navigationBar;
+    }
 
-        // Main Content Area
-        Div contentArea = new Div();
-        contentArea.getStyle().set("margin-left", "220px");
-        contentArea.getStyle().set("padding", "20px");
+    @Override
+    public void setParameter(BeforeEvent event, @OptionalParameter String parameter) {
+        this.userId = parameter;
+        if (userId != null && !userId.isEmpty()) {
+            welcomeMessage.setText("Welcome to Numerosity, " + userId + "!");
+            loadQuestionsAndInitialize();
+        } else {
+            welcomeMessage.setText("Please log in.");
+        }
+    }
 
-        H2 welcomeMessage = new H2("Welcome to Numerosity!");
-        welcomeMessage.getStyle().set("text-align", "center");
-        contentArea.add(welcomeMessage);
+    private void loadQuestionsAndInitialize() {
+        try {
+            // Load questions
+            questionJson = questionLoader.loadAsMap();
+            // Now you can use questionJson to display questions, etc.
+            displayQuestion(); // You'll need to implement this method
+        } catch (Exception e) {
+            Notification.show("Failed to load questions: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
 
-        HorizontalLayout layout = new HorizontalLayout(navigationBar, contentArea);
-        layout.setSizeFull();
+    private void displayQuestion() {
+        // Example: Display the first question
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionJson.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            contentArea.add(new H2((String) firstQuestion.get("text")));
 
-        add(layout);
+            // Example button
+            Button answerButton = new Button("Answer", e -> {
+                // Example: Log response and save to Firebase
+                boolean isCorrect = true; // Determine if the answer is correct
+                String questionId = (String) firstQuestion.get("id");
+                String subject = firstQuestion.get("tags").toString(); // Modify if your tags are structured differently
+                String difficulty = (String) firstQuestion.get("difficulty");
+
+                responseTracker.logResponse(questionId, isCorrect, subject, difficulty);
+                firebaseService.saveResponse(userId, responseTracker.getResponseLog());
+
+                updateQuestionJson(questionJson, questionId, "userAnswer", 10);
+                Notification.show("Answered and saved!");
+                displayQuestion();
+
+            });
+            contentArea.add(answerButton);
+        } else {
+            contentArea.add(new H2("No questions available."));
+        }
+    }
+
+    public void updateQuestionJson(Map<String, Object> questionJson, String questionId, String userAnswer, long timeTaken) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionJson.get("questions");
+        for (Map<String, Object> question : questions) {
+            if (question.get("id").equals(questionId)) {
+                question.put("user_answer", userAnswer);
+                question.put("user_time_taken", timeTaken);
+                break;
+            }
+        }
     }
 }
  
@@ -135,7 +323,6 @@ import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.firestore.Firestore;
 import com.google.cloud.firestore.FirestoreOptions;
 
-
 @Configuration
 @EnableWebMvc
 public class ApplicationConfig {
@@ -174,6 +361,66 @@ public class ApplicationConfig {
  
 ====================== 
  
+==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\entity\User.java ==== 
+ 
+package org.vaadin.numerosity.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private String username;
+
+    @Column(nullable = false)
+    private String password;
+
+    public User() {
+    }
+
+    public User(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
+ 
+====================== 
+ 
 ==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\Featureset\AppFunctions\bank.java ==== 
  
 package org.vaadin.numerosity.Featureset.AppFunctions;
@@ -243,6 +490,7 @@ public class bank extends VerticalLayout {
  
 package org.vaadin.numerosity.Featureset.AppFunctions;
 
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -264,9 +512,15 @@ public class rush extends VerticalLayout {
     private Div scoreDisplay = new Div();
     private int score = 0;
     private String correctAnswerKey; // Store the key ("a", "b", "c", or "d") of the correct answer
+    private String currentQuestionId;
+    private String currentDifficulty;
+    private String currentSubject;
 
     private final QuestionContentLoader questionLoader;
 
+    // To store question solving info: time, question ID, difficulty, subject
+    private Map<String, Object> rushModeData = new HashMap<>();
+
     @Autowired
     public rush(QuestionContentLoader questionLoader) throws Exception {
         this.questionLoader = questionLoader;
@@ -305,18 +559,27 @@ public class rush extends VerticalLayout {
 
     private void loadQuestion() {
         try {
-            String question = questionLoader.loadAsText();
-            questionDisplay.setText(question);
+            // Load the question as a Map
+            Map<String, Object> questionMap = questionLoader.loadAsMap();
+
+            // Extract question details
+            currentQuestionId = (String) questionLoader.getQuestionId(questionMap);
+            String questionText = (String) questionLoader.getQuestionText(questionMap);
+            currentDifficulty = (String) questionLoader.getQuestionDifficulty(questionMap);
+            currentSubject = questionLoader.getQuestionTags(questionMap).toString(); // Adjust if necessary
 
             // Load all answer choices
             Map<String, String> answerChoices = new HashMap<>();
-            answerChoices.put("a", questionLoader.getAnswerChoice("a"));
-            answerChoices.put("b", questionLoader.getAnswerChoice("b"));
-            answerChoices.put("c", questionLoader.getAnswerChoice("c"));
-            answerChoices.put("d", questionLoader.getAnswerChoice("d"));
+            answerChoices.put("a", questionLoader.getAnswerChoice(questionMap, "a"));
+            answerChoices.put("b", questionLoader.getAnswerChoice(questionMap, "b"));
+            answerChoices.put("c", questionLoader.getAnswerChoice(questionMap, "c"));
+            answerChoices.put("d", questionLoader.getAnswerChoice(questionMap, "d"));
+
+            // Determine the correct answer key
+            correctAnswerKey = questionLoader.getCorrectAnswerKey(questionMap);
 
-            //Determine the correct answer key
-            correctAnswerKey = questionLoader.getCorrectAnswerKey();
+            // Set question text
+            questionDisplay.setText(questionText);
 
             // Set button text
             answerButtons[0].setText(answerChoices.get("a"));
@@ -331,7 +594,7 @@ public class rush extends VerticalLayout {
     }
 
     private void handleAnswer(int index) {
-         // Determine which button was pressed to answer
+        // Determine which button was pressed to answer
         String selectedAnswerKey = null;
         switch (index) {
             case 0:
@@ -347,22 +610,27 @@ public class rush extends VerticalLayout {
                 selectedAnswerKey = "d";
                 break;
         }
+
+        // Validate answer
         boolean isCorrect = selectedAnswerKey != null && selectedAnswerKey.equals(correctAnswerKey);
 
+        // Store question solving information
+        long currentTime = Instant.now().toEpochMilli(); // Use milliseconds for better precision
+        rushModeData.put("questionSolvedAtTime", currentTime);
+        rushModeData.put("questionId", currentQuestionId);
+        rushModeData.put("questionDifficulty", currentDifficulty);
+        rushModeData.put("questionSubject", currentSubject);
+
         if (isCorrect) {
             score++;
             scoreDisplay.setText("Score: " + score);
-            loadQuestion();
+            Notification.show("Correct!");
         } else {
-            Notification.show("Game Over! Final Score: " + score);
-            resetGame();
+            Notification.show("Incorrect!");
         }
-    }
 
-    private void resetGame() {
-        score = 0;
-        scoreDisplay.setText("Score: 0");
-        loadQuestion(); //Load a new question after game over
+        // Load the next question
+        loadQuestion();
     }
 }
  
@@ -662,8 +930,10 @@ public class FsUserRepository implements UserRepository {
  
 package org.vaadin.numerosity.repository;
 
-import java.util.Optional;
 import java.util.Map;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.vaadin.numerosity.entity.User;
 
 public interface UserRepository {
 
@@ -678,7 +948,18 @@ public interface UserRepository {
 
     boolean userExists(String userId);
 }
- 
+
+/*
+ * package org.vaadin.numerosity.repository;
+ * 
+ * import org.springframework.data.jpa.repository.JpaRepository;
+ * import org.vaadin.numerosity.entity.User;
+ * 
+ * public interface UserRepository extends JpaRepository<User, Long> {
+ * User findByUsername(String username);
+ * }
+ * 
+ */ 
 ====================== 
  
 ==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\repository\exception\DbException.java ==== 
@@ -1028,35 +1309,25 @@ public class DataPlotter {
  
 package org.vaadin.numerosity.Subsystems;
 
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.util.Map;
 
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
+import org.springframework.beans.factory.annotation.Autowired;
 
-public class FirebaseHandler {
-    private String databaseUrl;
-    private String pathToKey;
+import com.google.cloud.firestore.Firestore;
 
-    public FirebaseHandler(String databaseUrl) {
-        this.databaseUrl = databaseUrl;
-    }
+public class FirebaseHandler {
 
-    public void initialize() throws IOException {
-        FileInputStream serviceAccount = new FileInputStream(pathToKey); // Use pathToKey
-        FirebaseOptions options = FirebaseOptions.builder()
-                .setCredentials(GoogleCredentials.fromStream(serviceAccount))
-                .setDatabaseUrl(databaseUrl)
-                .build();
-        FirebaseApp.initializeApp(options);
-    }
+    @Autowired
+    private Firestore firestore;
 
-    public void setPathToKey(String pathToKey) {
-        this.pathToKey = pathToKey;
+    public void saveResponse(String userId, Map<String, Object> responseLog) {
+        try {
+            firestore.collection("responses").document(userId).set(responseLog);
+            System.out.println("Responses saved successfully!");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
-
-    // No longer need to setDatabaseURL
 }
 
 /*
@@ -1238,7 +1509,11 @@ public class LocalDatabaseHandler {
         return loadSpecificQuestion(chosenQuestion, testing_directory);
     }
 
-    public String getChosenQuestion() {
+    public Map<String,Object> getChosenQuestionMap() throws Exception {
+        return loadSpecificQuestion(chosenQuestion, testing_directory);
+    }
+
+    public String getChosenQuestion() throws Exception {
         return chosenQuestion;
     }
 
@@ -1326,100 +1601,174 @@ public class LocalDatabaseHandler {
  
 ====================== 
  
-==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\Subsystems\LoginHandler.java ==== 
+==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\Subsystems\QuestionContentLoader.java ==== 
  
 package org.vaadin.numerosity.Subsystems;
 
-import java.util.concurrent.ExecutionException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseAuthException;
-import com.google.firebase.auth.FirebaseToken;
-import com.google.firebase.auth.UserRecord;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
-public class LoginHandler {
+public class QuestionContentLoader {
 
-    @Autowired
-    private DatabaseHandler databaseHandler;
+    private final String questionsFile = "questions.json"; // Path to your JSON file
+    private JsonNode rootNode; // Store the root JSON node
 
-    public String login(String email, String password) throws ExecutionException, InterruptedException {
+    public QuestionContentLoader() {
         try {
-            UserRecord userRecord = FirebaseAuth.getInstance().getUserByEmail(email);
-            String userId = userRecord.getUid();
-
-            // Ensure user exists in Firestore
-            if (!databaseHandler.userExists(userId)) {
-                databaseHandler.createUserDocument(userId, email);
+            // Load the JSON data when the service is created
+            InputStream inputStream = getClass().getClassLoader().getResourceAsStream(questionsFile);
+            if (inputStream == null) {
+                throw new IOException("Could not find file: " + questionsFile);
             }
+            ObjectMapper mapper = new ObjectMapper();
+            rootNode = mapper.readTree(inputStream);
+        } catch (IOException e) {
+            // Handle exception (e.g., log it, throw a runtime exception)
+            System.err.println("Error loading questions from JSON: " + e.getMessage());
+            rootNode = null; // Ensure rootNode is null to prevent further errors
+        }
+    }
 
-            return FirebaseAuth.getInstance().createCustomToken(userId);
-        } catch (FirebaseAuthException e) {
-            return "Login failed: " + e.getMessage();
+    public Map<String, Object> loadAsMap() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
         }
+
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.convertValue(rootNode, Map.class);
     }
 
-    public boolean logout(String idToken) {
-        try {
-            FirebaseToken decodedToken = FirebaseAuth.getInstance().verifyIdToken(idToken);
-            FirebaseAuth.getInstance().revokeRefreshTokens(decodedToken.getUid());
-            return true;
-        } catch (FirebaseAuthException e) {
-            return false;
+    public String loadAsText() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
         }
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode textNode = firstQuestion.get("text");
+            if (textNode != null) {
+                return textNode.asText();
+            }
+        }
+
+        return "No questions available.";
     }
-}
- 
-====================== 
- 
-==== File: C:\Git\Numerosity\server\src\main\java\org\vaadin\numerosity\Subsystems\QuestionContentLoader.java ==== 
- 
-//  A class is needed to appropriately load text or latex content from questions
-//  Create a new class to do this in:
-package org.vaadin.numerosity.Subsystems;
 
-import java.util.Map;
+    public String getAnswerChoice(Map<String, Object> questionMap, String choiceId) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            List<Map<String, Object>> options = (List<Map<String, Object>>) firstQuestion.get("options");
+            if (options != null) {
+                for (Map<String, Object> option : options) {
+                    if (option.get("id").equals(choiceId)) {
+                        return (String) option.get("text");
+                    }
+                }
+            }
+        }
+        return null; // Or a default value if needed
+    }
 
-import org.springframework.stereotype.Service;
+   public String getCorrectAnswerKey(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("correct_option_id");
+        }
+        return null; // Or a default value if needed
+    }
 
-@Service
-public class QuestionContentLoader {
+    //Get question ID
+    public String getQuestionId(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("id");
+        }
+        return null; // Or a default value if needed
+    }
 
-    private final LocalDatabaseHandler localDbHandler;
-    private Map<String, Object> chosenQuestionMap;
-    public QuestionContentLoader(LocalDatabaseHandler localDbHandler) {
-        this.localDbHandler = localDbHandler;
+    //Get question Text
+    public String getQuestionText(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("text");
+        }
+        return null; // Or a default value if needed
     }
 
-    public String loadAsText() throws Exception {
-        Map<String, Object> question = localDbHandler.loadRandomQuestion();
-        chosenQuestionMap = question;
-        if (!question.containsKey("text")) {
-            throw new IllegalArgumentException("Question has no 'text' field");
+    //Get question difficulty
+     public String getQuestionDifficulty(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("difficulty");
         }
-        return question.get("text").toString();
+        return null; // Or a default value if needed
     }
 
-    public String loadAsLatex() throws Exception {
-        Map<String, Object> question = localDbHandler.loadRandomQuestion();
-        if (!question.containsKey("latex")) {
-            throw new IllegalArgumentException("Question has no 'latex' field");
+    //Get question Tags
+    public List<String> getQuestionTags(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (List<String>) firstQuestion.get("tags");
         }
-        return question.get("latex").toString();
+        return null; // Or a default value if needed
     }
 
-    public String getAnswerChoice(String letter) throws Exception {
-        //return localDbHandler.getAnswerChoiceText(localDbHandler.getChosenQuestion(), optionChoice);
-        return localDbHandler.getAnswerChoiceText(localDbHandler.getChosenQuestion(), letter);
+    public String getAnswerChoice(String choiceId) throws IOException {
+         if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
+        }
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode optionsNode = firstQuestion.get("options");
+
+            if (optionsNode != null && optionsNode.isArray()) {
+                for (JsonNode option : optionsNode) {
+                    if (choiceId.equals(option.get("id").asText())) {
+                        return option.get("text").asText();
+                    }
+                }
+            }
+        }
+
+        return "Answer not available.";
     }
 
-    public String getCorrectAnswerKey() {
-        return chosenQuestionMap.get(localDbHandler.getChosenQuestion()).get("correct");
+    public String getCorrectAnswerKey() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
+        }
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode correctAnswerNode = firstQuestion.get("correct_option_id");
+            if (correctAnswerNode != null) {
+                return correctAnswerNode.asText();
+            }
+        }
+
+        return "Correct answer not available.";
     }
-    
 }
  
 ====================== 
@@ -1431,6 +1780,8 @@ package org.vaadin.numerosity.Subsystems;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -1439,18 +1790,11 @@ import org.slf4j.LoggerFactory;
 public class ResponseHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(ResponseHandler.class);
-    private final LocalDatabaseHandler localDbHandler;
-    private final DatabaseHandler dbHandler;
-    private final DataPlotter dataPlotter;
+    private final LocalDatabaseHandler localDbHandler = null;
+    private final DatabaseHandler dbHandler = null;
     private String userId;
     private String questionId;
 
-    public ResponseHandler(LocalDatabaseHandler localDbHandler, DatabaseHandler dbHandler, DataPlotter dataPlotter) {
-        this.localDbHandler = localDbHandler;
-        this.dbHandler = dbHandler;
-        this.dataPlotter = dataPlotter;
-    }
-
     public ResponseResult handleResponse(String questionId, String userAnswer) {
         Instant startTime = Instant.now();
         boolean isCorrect = validateAnswer(questionId, userAnswer);
@@ -1509,6 +1853,33 @@ public class ResponseHandler {
             return timeTakenMillis;
         }
     }
+
+    private Map<String, Object> responseLog = new HashMap<>();
+
+    public void logResponse(String questionId, boolean isCorrect, String subject, String difficulty) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("question_id", questionId);
+        response.put("correct", isCorrect);
+        response.put("subject", subject);
+        response.put("difficulty", difficulty);
+
+        responseLog.put(questionId, response);
+    }
+
+    public Map<String, Object> getResponseLog() {
+        return responseLog;
+    }
+
+    public void updateQuestionJson(Map<String, Object> questionJson, String questionId, String userAnswer, long timeTaken) {
+        for (Map<String, Object> question : (List<Map<String, Object>>) questionJson.get("correct_option_id")) {
+            if (question.get("id").equals(questionId)) {
+                question.put("user_answer", userAnswer);
+                question.put("user_time_taken", timeTaken);
+                break;
+            }
+        }
+    }
+    
 }
  
 ====================== 
diff --git a/server/src/main/java/org/vaadin/numerosity/Application.java b/server/src/main/java/org/vaadin/numerosity/Application.java
index 70c8ffc..2882cb5 100644
--- a/server/src/main/java/org/vaadin/numerosity/Application.java
+++ b/server/src/main/java/org/vaadin/numerosity/Application.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.server.PWA;
@@ -11,6 +13,9 @@
  * The entry point of the Spring Boot application.
  */
 @SpringBootApplication
+@EnableJpaRepositories
+@EnableTransactionManagement
+
 @PWA(name = "Numerosity - Math Practice App", shortName = "Numerosity")
 @Theme(variant = "Lumo.dark")
 public class Application implements AppShellConfigurator {
diff --git a/server/src/main/java/org/vaadin/numerosity/Featureset/AppFunctions/rush.java b/server/src/main/java/org/vaadin/numerosity/Featureset/AppFunctions/rush.java
index 3ff95b4..8c00a59 100644
--- a/server/src/main/java/org/vaadin/numerosity/Featureset/AppFunctions/rush.java
+++ b/server/src/main/java/org/vaadin/numerosity/Featureset/AppFunctions/rush.java
@@ -1,5 +1,6 @@
 package org.vaadin.numerosity.Featureset.AppFunctions;
 
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -21,9 +22,15 @@ public class rush extends VerticalLayout {
     private Div scoreDisplay = new Div();
     private int score = 0;
     private String correctAnswerKey; // Store the key ("a", "b", "c", or "d") of the correct answer
+    private String currentQuestionId;
+    private String currentDifficulty;
+    private String currentSubject;
 
     private final QuestionContentLoader questionLoader;
 
+    // To store question solving info: time, question ID, difficulty, subject
+    private Map<String, Object> rushModeData = new HashMap<>();
+
     @Autowired
     public rush(QuestionContentLoader questionLoader) throws Exception {
         this.questionLoader = questionLoader;
@@ -62,18 +69,27 @@ public rush(QuestionContentLoader questionLoader) throws Exception {
 
     private void loadQuestion() {
         try {
-            String question = questionLoader.loadAsText();
-            questionDisplay.setText(question);
+            // Load the question as a Map
+            Map<String, Object> questionMap = questionLoader.loadAsMap();
+
+            // Extract question details
+            currentQuestionId = (String) questionLoader.getQuestionId(questionMap);
+            String questionText = (String) questionLoader.getQuestionText(questionMap);
+            currentDifficulty = (String) questionLoader.getQuestionDifficulty(questionMap);
+            currentSubject = questionLoader.getQuestionTags(questionMap).toString(); // Adjust if necessary
 
             // Load all answer choices
             Map<String, String> answerChoices = new HashMap<>();
-            answerChoices.put("a", questionLoader.getAnswerChoice("a"));
-            answerChoices.put("b", questionLoader.getAnswerChoice("b"));
-            answerChoices.put("c", questionLoader.getAnswerChoice("c"));
-            answerChoices.put("d", questionLoader.getAnswerChoice("d"));
+            answerChoices.put("a", questionLoader.getAnswerChoice(questionMap, "a"));
+            answerChoices.put("b", questionLoader.getAnswerChoice(questionMap, "b"));
+            answerChoices.put("c", questionLoader.getAnswerChoice(questionMap, "c"));
+            answerChoices.put("d", questionLoader.getAnswerChoice(questionMap, "d"));
 
-            //Determine the correct answer key
-            correctAnswerKey = questionLoader.getCorrectAnswerKey();
+            // Determine the correct answer key
+            correctAnswerKey = questionLoader.getCorrectAnswerKey(questionMap);
+
+            // Set question text
+            questionDisplay.setText(questionText);
 
             // Set button text
             answerButtons[0].setText(answerChoices.get("a"));
@@ -88,7 +104,7 @@ private void loadQuestion() {
     }
 
     private void handleAnswer(int index) {
-         // Determine which button was pressed to answer
+        // Determine which button was pressed to answer
         String selectedAnswerKey = null;
         switch (index) {
             case 0:
@@ -104,21 +120,26 @@ private void handleAnswer(int index) {
                 selectedAnswerKey = "d";
                 break;
         }
+
+        // Validate answer
         boolean isCorrect = selectedAnswerKey != null && selectedAnswerKey.equals(correctAnswerKey);
 
+        // Store question solving information
+        long currentTime = Instant.now().toEpochMilli(); // Use milliseconds for better precision
+        rushModeData.put("questionSolvedAtTime", currentTime);
+        rushModeData.put("questionId", currentQuestionId);
+        rushModeData.put("questionDifficulty", currentDifficulty);
+        rushModeData.put("questionSubject", currentSubject);
+
         if (isCorrect) {
             score++;
             scoreDisplay.setText("Score: " + score);
-            loadQuestion();
+            Notification.show("Correct!");
         } else {
-            Notification.show("Game Over! Final Score: " + score);
-            resetGame();
+            Notification.show("Incorrect!");
         }
-    }
 
-    private void resetGame() {
-        score = 0;
-        scoreDisplay.setText("Score: 0");
-        loadQuestion(); //Load a new question after game over
+        // Load the next question
+        loadQuestion();
     }
 }
diff --git a/server/src/main/java/org/vaadin/numerosity/MainView.java b/server/src/main/java/org/vaadin/numerosity/MainView.java
index c856069..86908bc 100644
--- a/server/src/main/java/org/vaadin/numerosity/MainView.java
+++ b/server/src/main/java/org/vaadin/numerosity/MainView.java
@@ -1,49 +1,215 @@
 package org.vaadin.numerosity;
 
-import org.vaadin.numerosity.Featureset.AppFunctions.bank;
-import org.vaadin.numerosity.Featureset.AppFunctions.rush;
-import org.vaadin.numerosity.Featureset.AppFunctions.zen;
-
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.H1;
-import com.vaadin.flow.component.html.H2;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.router.RouterLink;
-
-public class MainView extends VerticalLayout {
-
-    public MainView() {
-        // Header
-        H1 header = new H1("Numerosity");
-        header.getStyle().set("text-align", "center");
-        add(header);
-
-        // Navigation Links
-        Div navigationBar = new Div();
-        navigationBar.getStyle().set("width", "200px");
-        navigationBar.getStyle().set("border-right", "1px solid black");
-        navigationBar.getStyle().set("height", "100%");
-        navigationBar.getStyle().set("position", "fixed");
-
-        RouterLink practiceLink = new RouterLink("Practice", bank.class);
-        RouterLink rushLink = new RouterLink("Rush", rush.class);
-        RouterLink dailyLink = new RouterLink("Daily", zen.class);
-
-        navigationBar.add(practiceLink, rushLink, dailyLink);
-
-        // Main Content Area
-        Div contentArea = new Div();
-        contentArea.getStyle().set("margin-left", "220px");
-        contentArea.getStyle().set("padding", "20px");
-
-        H2 welcomeMessage = new H2("Welcome to Numerosity!");
-        welcomeMessage.getStyle().set("text-align", "center");
-        contentArea.add(welcomeMessage);
-
-        HorizontalLayout layout = new HorizontalLayout(navigationBar, contentArea);
-        layout.setSizeFull();
-
-        add(layout);
+import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.html.H1; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.PasswordField; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.router.BeforeEvent; import com.vaadin.flow.router.HasUrlParameter; import com.vaadin.flow.router.OptionalParameter; import com.vaadin.flow.router.Route; import com.vaadin.flow.router.RouterLink; import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.numerosity.Featureset.AppFunctions.bank; import org.vaadin.numerosity.Featureset.AppFunctions.rush; import org.vaadin.numerosity.Featureset.AppFunctions.zen; import org.vaadin.numerosity.Subsystems.DataPlotter; import org.vaadin.numerosity.Subsystems.DatabaseHandler; import org.vaadin.numerosity.Subsystems.FirebaseHandler; import org.vaadin.numerosity.Subsystems.LocalDatabaseHandler; import org.vaadin.numerosity.Subsystems.QuestionContentLoader; import org.vaadin.numerosity.Subsystems.ResponseHandler; import org.vaadin.numerosity.entity.User; import org.vaadin.numerosity.repository.UserRepository;
+
+import java.util.List; import java.util.Map;
+
+@Route("main") public class MainView extends VerticalLayout implements HasUrlParameter<String> {
+
+private String userId;
+private Div contentArea = new Div();
+private H2 welcomeMessage = new H2();
+private final FirebaseHandler firebaseService;
+private final QuestionContentLoader questionLoader;
+private final LocalDatabaseHandler localDbHandler;
+private final DatabaseHandler DbHandler;
+private final DataPlotter dataPlotter;
+private Map<String, Object> questionJson;
+private ResponseHandler responseTracker;
+
+// Login/Registration Components
+private TextField usernameField = new TextField("Username");
+private PasswordField passwordField = new PasswordField("Password");
+private Button loginButton = new Button("Login");
+private Button registerButton = new Button("Register");
+
+@Autowired
+private UserRepository userRepository;
+
+@Autowired
+public MainView(FirebaseHandler firebaseService, QuestionContentLoader questionLoader, UserRepository userRepository) {
+    this.firebaseService = firebaseService;
+    this.questionLoader = questionLoader;
+    this.localDbHandler = null;
+    this.DbHandler = null;
+    this.dataPlotter = new DataPlotter();
+    this.userRepository = userRepository;
+
+    // Header
+    H1 header = new H1("Numerosity");
+    header.getStyle().set("text-align", "center");
+    add(header);
+
+    // Create and add the login page layout
+    VerticalLayout loginPage = createLoginForm();
+    add(loginPage);
+
+    // Create navigation bar (initially hidden)
+    Div navigationBar = createNavigationBar();
+    navigationBar.setVisible(false);
+
+    // Configure the content area that will display questions after login
+    contentArea.getStyle().set("margin-left", "220px");
+    contentArea.getStyle().set("padding", "20px");
+    contentArea.add(welcomeMessage);
+    contentArea.setVisible(false);
+
+    HorizontalLayout mainLayout = new HorizontalLayout(navigationBar, contentArea);
+    mainLayout.setSizeFull();
+    add(mainLayout);
+}
+
+/**
+ * Creates a login form that includes login and registration functionality.
+ */
+private VerticalLayout createLoginForm() {
+    VerticalLayout loginForm = new VerticalLayout();
+
+    // Configure Login Button
+    loginButton.addClickListener(e -> {
+        String username = usernameField.getValue();
+        String password = passwordField.getValue();
+
+        User user = userRepository.findByUsername(username);
+        if (user != null && user.getPassword().equals(password)) {
+            // Authentication successful – update state and show main content
+            this.userId = username;
+            welcomeMessage.setText("Welcome to Numerosity, " + userId + "!");
+            loadQuestionsAndInitialize();
+            showMainView();
+        } else {
+            Notification.show("Invalid username or password.");
+        }
+    });
+
+    // Configure Registration Button
+    registerButton.addClickListener(e -> {
+        String username = usernameField.getValue();
+        String password = passwordField.getValue();
+        if (username == null || username.isEmpty() || password == null || password.isEmpty()) {
+            Notification.show("Username and password cannot be empty.");
+            return;
+        }
+        if (userRepository.findByUsername(username) != null) {
+            Notification.show("Username already exists.");
+            return;
+        }
+        User newUser = new User(username, password);
+        userRepository.save(newUser);
+        Notification.show("Registration successful. Please log in.");
+    });
+
+    loginForm.add(usernameField, passwordField, loginButton, registerButton);
+    return loginForm;
+}
+
+/**
+ * Shows the main view (navigation bar and content area) after successful login.
+ */
+private void showMainView() {
+    // Find the navigation bar and content area from the layout
+    HorizontalLayout layout = (HorizontalLayout) this.getChildren()
+            .filter(component -> component instanceof HorizontalLayout)
+            .findFirst().orElse(null);
+
+    if (layout != null) {
+        Div navigationBar = (Div) layout.getChildren()
+                .filter(component -> component instanceof Div)
+                .findFirst().orElse(null);
+
+        if (navigationBar != null) {
+            navigationBar.setVisible(true);
+        }
+        contentArea.setVisible(true);
+
+        // Hide the login form
+        getChildren().filter(component -> component instanceof VerticalLayout)
+                .findFirst().ifPresent(component -> component.setVisible(false));
+    }
+}
+
+/**
+ * Creates a navigation bar with links to other views.
+ */
+private Div createNavigationBar() {
+    Div navigationBar = new Div();
+    navigationBar.getStyle().set("width", "200px");
+    navigationBar.getStyle().set("border-right", "1px solid black");
+    navigationBar.getStyle().set("height", "100%");
+    navigationBar.getStyle().set("position", "fixed");
+
+    RouterLink practiceLink = new RouterLink("Practice", bank.class);
+    RouterLink rushLink = new RouterLink("Rush", rush.class);
+    RouterLink dailyLink = new RouterLink("Daily", zen.class);
+
+    navigationBar.add(practiceLink, rushLink, dailyLink);
+    return navigationBar;
+}
+
+@Override
+public void setParameter(BeforeEvent event, @OptionalParameter String parameter) {
+    this.userId = parameter;
+    if (userId != null && !userId.isEmpty()) {
+        welcomeMessage.setText("Welcome to Numerosity, " + userId + "!");
+        loadQuestionsAndInitialize();
+    } else {
+        welcomeMessage.setText("Please log in.");
+    }
+}
+
+/**
+ * Loads questions from the question loader and initializes the question display.
+ */
+private void loadQuestionsAndInitialize() {
+    try {
+        questionJson = questionLoader.loadAsMap();
+        displayQuestion();
+    } catch (Exception e) {
+        Notification.show("Failed to load questions: " + e.getMessage());
+        e.printStackTrace();
     }
 }
+
+/**
+ * Displays the first question from the loaded JSON.
+ */
+private void displayQuestion() {
+    List<Map<String, Object>> questions = (List<Map<String, Object>>) questionJson.get("questions");
+    if (questions != null && !questions.isEmpty()) {
+        Map<String, Object> firstQuestion = questions.get(0);
+        contentArea.add(new H2((String) firstQuestion.get("text")));
+
+        Button answerButton = new Button("Answer", e -> {
+            boolean isCorrect = true; // Replace with actual answer checking logic
+            String questionId = (String) firstQuestion.get("id");
+            String subject = firstQuestion.get("tags").toString();
+            String difficulty = (String) firstQuestion.get("difficulty");
+
+            responseTracker.logResponse(questionId, isCorrect, subject, difficulty);
+            firebaseService.saveResponse(userId, responseTracker.getResponseLog());
+
+            updateQuestionJson(questionJson, questionId, "userAnswer", 10);
+            Notification.show("Answered and saved!");
+            displayQuestion();
+        });
+        contentArea.add(answerButton);
+    } else {
+        contentArea.add(new H2("No questions available."));
+    }
+}
+
+/**
+ * Updates the question JSON with the user’s answer and time taken.
+ */
+public void updateQuestionJson(Map<String, Object> questionJson, String questionId, String userAnswer, long timeTaken) {
+    List<Map<String, Object>> questions = (List<Map<String, Object>>) questionJson.get("questions");
+    for (Map<String, Object> question : questions) {
+        if (question.get("id").equals(questionId)) {
+            question.put("user_answer", userAnswer);
+            question.put("user_time_taken", timeTaken);
+            break;
+        }
+    }
+}
+
+}
\ No newline at end of file
diff --git a/server/src/main/java/org/vaadin/numerosity/Subsystems/FirebaseHandler.java b/server/src/main/java/org/vaadin/numerosity/Subsystems/FirebaseHandler.java
index 742ca3d..2b05497 100644
--- a/server/src/main/java/org/vaadin/numerosity/Subsystems/FirebaseHandler.java
+++ b/server/src/main/java/org/vaadin/numerosity/Subsystems/FirebaseHandler.java
@@ -1,34 +1,24 @@
 package org.vaadin.numerosity.Subsystems;
 
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.util.Map;
 
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.google.cloud.firestore.Firestore;
 
 public class FirebaseHandler {
-    private String databaseUrl;
-    private String pathToKey;
 
-    public FirebaseHandler(String databaseUrl) {
-        this.databaseUrl = databaseUrl;
-    }
+    @Autowired
+    private Firestore firestore;
 
-    public void initialize() throws IOException {
-        FileInputStream serviceAccount = new FileInputStream(pathToKey); // Use pathToKey
-        FirebaseOptions options = FirebaseOptions.builder()
-                .setCredentials(GoogleCredentials.fromStream(serviceAccount))
-                .setDatabaseUrl(databaseUrl)
-                .build();
-        FirebaseApp.initializeApp(options);
+    public void saveResponse(String userId, Map<String, Object> responseLog) {
+        try {
+            firestore.collection("responses").document(userId).set(responseLog);
+            System.out.println("Responses saved successfully!");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
-
-    public void setPathToKey(String pathToKey) {
-        this.pathToKey = pathToKey;
-    }
-
-    // No longer need to setDatabaseURL
 }
 
 /*
diff --git a/server/src/main/java/org/vaadin/numerosity/Subsystems/LoginHandler.java b/server/src/main/java/org/vaadin/numerosity/Subsystems/LoginHandler.java
deleted file mode 100644
index 78b9c58..0000000
--- a/server/src/main/java/org/vaadin/numerosity/Subsystems/LoginHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.vaadin.numerosity.Subsystems;
-
-import java.util.concurrent.ExecutionException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseAuthException;
-import com.google.firebase.auth.FirebaseToken;
-import com.google.firebase.auth.UserRecord;
-
-@Service
-public class LoginHandler {
-
-    @Autowired
-    private DatabaseHandler databaseHandler;
-
-    public String login(String email, String password) throws ExecutionException, InterruptedException {
-        try {
-            UserRecord userRecord = FirebaseAuth.getInstance().getUserByEmail(email);
-            String userId = userRecord.getUid();
-
-            // Ensure user exists in Firestore
-            if (!databaseHandler.userExists(userId)) {
-                databaseHandler.createUserDocument(userId, email);
-            }
-
-            return FirebaseAuth.getInstance().createCustomToken(userId);
-        } catch (FirebaseAuthException e) {
-            return "Login failed: " + e.getMessage();
-        }
-    }
-
-    public boolean logout(String idToken) {
-        try {
-            FirebaseToken decodedToken = FirebaseAuth.getInstance().verifyIdToken(idToken);
-            FirebaseAuth.getInstance().revokeRefreshTokens(decodedToken.getUid());
-            return true;
-        } catch (FirebaseAuthException e) {
-            return false;
-        }
-    }
-}
diff --git a/server/src/main/java/org/vaadin/numerosity/Subsystems/QuestionContentLoader.java b/server/src/main/java/org/vaadin/numerosity/Subsystems/QuestionContentLoader.java
index bc173e3..b3d35c5 100644
--- a/server/src/main/java/org/vaadin/numerosity/Subsystems/QuestionContentLoader.java
+++ b/server/src/main/java/org/vaadin/numerosity/Subsystems/QuestionContentLoader.java
@@ -1,52 +1,167 @@
-//  A class is needed to appropriately load text or latex content from questions
-//  Create a new class to do this in:
 package org.vaadin.numerosity.Subsystems;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Service
 public class QuestionContentLoader {
 
-    private final LocalDatabaseHandler localDbHandler;
-    private Map<String, Object> chosenQuestionMap;
-    public QuestionContentLoader(LocalDatabaseHandler localDbHandler) {
-        this.localDbHandler = localDbHandler;
+    private final String questionsFile = "questions.json"; // Path to your JSON file
+    private JsonNode rootNode; // Store the root JSON node
+
+    public QuestionContentLoader() {
+        try {
+            // Load the JSON data when the service is created
+            InputStream inputStream = getClass().getClassLoader().getResourceAsStream(questionsFile);
+            if (inputStream == null) {
+                throw new IOException("Could not find file: " + questionsFile);
+            }
+            ObjectMapper mapper = new ObjectMapper();
+            rootNode = mapper.readTree(inputStream);
+        } catch (IOException e) {
+            // Handle exception (e.g., log it, throw a runtime exception)
+            System.err.println("Error loading questions from JSON: " + e.getMessage());
+            rootNode = null; // Ensure rootNode is null to prevent further errors
+        }
     }
 
-    public String loadAsText() throws Exception {
-        Map<String, Object> question = localDbHandler.loadRandomQuestion();
-        chosenQuestionMap = question;
-        if (!question.containsKey("text")) {
-            throw new IllegalArgumentException("Question has no 'text' field");
+    public Map<String, Object> loadAsMap() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
         }
-        return question.get("text").toString();
+
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.convertValue(rootNode, Map.class);
     }
 
-    public String loadAsLatex() throws Exception {
-        Map<String, Object> question = localDbHandler.loadRandomQuestion();
-        if (!question.containsKey("latex")) {
-            throw new IllegalArgumentException("Question has no 'latex' field");
+    public String loadAsText() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
         }
-        return question.get("latex").toString();
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode textNode = firstQuestion.get("text");
+            if (textNode != null) {
+                return textNode.asText();
+            }
+        }
+
+        return "No questions available.";
     }
 
-    public String getAnswerChoice(String letter) throws Exception {
-        //return localDbHandler.getAnswerChoiceText(localDbHandler.getChosenQuestion(), optionChoice);
-        return localDbHandler.getAnswerChoiceText(localDbHandler.getChosenQuestion(), letter);
+    public String getAnswerChoice(Map<String, Object> questionMap, String choiceId) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            List<Map<String, Object>> options = (List<Map<String, Object>>) firstQuestion.get("options");
+            if (options != null) {
+                for (Map<String, Object> option : options) {
+                    if (option.get("id").equals(choiceId)) {
+                        return (String) option.get("text");
+                    }
+                }
+            }
+        }
+        return null; // Or a default value if needed
+    }
+
+   public String getCorrectAnswerKey(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("correct_option_id");
+        }
+        return null; // Or a default value if needed
+    }
+
+    //Get question ID
+    public String getQuestionId(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("id");
+        }
+        return null; // Or a default value if needed
+    }
+
+    //Get question Text
+    public String getQuestionText(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("text");
+        }
+        return null; // Or a default value if needed
     }
 
-    // public String getCorrectAnswerKey() {
-    //     return chosenQuestionMap.get(localDbHandler.getChosenQuestion()).get("correct_option_id");
-    // }
-    
-    public String getCorrectAnswerKey() throws Exception{
-        // Map<String, String> questionData = chosenQuestionMap.get(localDbHandler.getChosenQuestionMap());
-        if (chosenQuestionMap == null || !chosenQuestionMap.containsKey("correct_option_id")) {
-            throw new IllegalStateException("No 'correct_option_id' answer found for the chosen question.");
+    //Get question difficulty
+     public String getQuestionDifficulty(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (String) firstQuestion.get("difficulty");
         }
-        return (String) chosenQuestionMap.get("correct_option_id");
+        return null; // Or a default value if needed
+    }
+
+    //Get question Tags
+    public List<String> getQuestionTags(Map<String, Object> questionMap) {
+        List<Map<String, Object>> questions = (List<Map<String, Object>>) questionMap.get("questions");
+        if (questions != null && !questions.isEmpty()) {
+            Map<String, Object> firstQuestion = questions.get(0);
+            return (List<String>) firstQuestion.get("tags");
+        }
+        return null; // Or a default value if needed
+    }
+
+    public String getAnswerChoice(String choiceId) throws IOException {
+         if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
+        }
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode optionsNode = firstQuestion.get("options");
+
+            if (optionsNode != null && optionsNode.isArray()) {
+                for (JsonNode option : optionsNode) {
+                    if (choiceId.equals(option.get("id").asText())) {
+                        return option.get("text").asText();
+                    }
+                }
+            }
+        }
+
+        return "Answer not available.";
+    }
+
+    public String getCorrectAnswerKey() throws IOException {
+        if (rootNode == null) {
+            throw new IOException("Questions not loaded.");
+        }
+
+        // Get the first question text from the JSON
+        JsonNode questionsNode = rootNode.get("questions");
+        if (questionsNode != null && questionsNode.isArray() && questionsNode.size() > 0) {
+            JsonNode firstQuestion = questionsNode.get(0);
+            JsonNode correctAnswerNode = firstQuestion.get("correct_option_id");
+            if (correctAnswerNode != null) {
+                return correctAnswerNode.asText();
+            }
+        }
+
+        return "Correct answer not available.";
     }
-    
 }
diff --git a/server/src/main/java/org/vaadin/numerosity/Subsystems/ResponseHandler.java b/server/src/main/java/org/vaadin/numerosity/Subsystems/ResponseHandler.java
index 93c4632..fd2bbaf 100644
--- a/server/src/main/java/org/vaadin/numerosity/Subsystems/ResponseHandler.java
+++ b/server/src/main/java/org/vaadin/numerosity/Subsystems/ResponseHandler.java
@@ -3,6 +3,8 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -11,18 +13,11 @@
 public class ResponseHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(ResponseHandler.class);
-    private final LocalDatabaseHandler localDbHandler;
-    private final DatabaseHandler dbHandler;
-    private final DataPlotter dataPlotter;
+    private final LocalDatabaseHandler localDbHandler = null;
+    private final DatabaseHandler dbHandler = null;
     private String userId;
     private String questionId;
 
-    public ResponseHandler(LocalDatabaseHandler localDbHandler, DatabaseHandler dbHandler, DataPlotter dataPlotter) {
-        this.localDbHandler = localDbHandler;
-        this.dbHandler = dbHandler;
-        this.dataPlotter = dataPlotter;
-    }
-
     public ResponseResult handleResponse(String questionId, String userAnswer) {
         Instant startTime = Instant.now();
         boolean isCorrect = validateAnswer(questionId, userAnswer);
@@ -81,4 +76,31 @@ public long getTimeTakenMillis() {
             return timeTakenMillis;
         }
     }
+
+    private Map<String, Object> responseLog = new HashMap<>();
+
+    public void logResponse(String questionId, boolean isCorrect, String subject, String difficulty) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("question_id", questionId);
+        response.put("correct", isCorrect);
+        response.put("subject", subject);
+        response.put("difficulty", difficulty);
+
+        responseLog.put(questionId, response);
+    }
+
+    public Map<String, Object> getResponseLog() {
+        return responseLog;
+    }
+
+    public void updateQuestionJson(Map<String, Object> questionJson, String questionId, String userAnswer, long timeTaken) {
+        for (Map<String, Object> question : (List<Map<String, Object>>) questionJson.get("correct_option_id")) {
+            if (question.get("id").equals(questionId)) {
+                question.put("user_answer", userAnswer);
+                question.put("user_time_taken", timeTaken);
+                break;
+            }
+        }
+    }
+    
 }
diff --git a/server/src/main/java/org/vaadin/numerosity/config/ApplicationConfig.java b/server/src/main/java/org/vaadin/numerosity/config/ApplicationConfig.java
index 036de14..2095171 100644
--- a/server/src/main/java/org/vaadin/numerosity/config/ApplicationConfig.java
+++ b/server/src/main/java/org/vaadin/numerosity/config/ApplicationConfig.java
@@ -1,6 +1,5 @@
 package org.vaadin.numerosity.config;
 
-
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -9,13 +8,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.vaadin.numerosity.repository.FsUserRepository;
-import org.vaadin.numerosity.repository.UserRepository;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.firestore.Firestore;
 import com.google.cloud.firestore.FirestoreOptions;
 
-
 @Configuration
 @EnableWebMvc
 public class ApplicationConfig {
@@ -26,28 +23,23 @@ public class ApplicationConfig {
     @Value("${firebase.credentials.path}")
     private String credentialsPath;
 
-
     @Bean
     public Firestore getFirestore() {
         try {
-
-        InputStream inStream = this.getClass().getClassLoader().getResourceAsStream(credentialsPath);    
-        GoogleCredentials credentials = GoogleCredentials.fromStream(inStream);
-        FirestoreOptions firestoreOptions = FirestoreOptions.getDefaultInstance().toBuilder()
-                .setProjectId(projectId)
-                .setCredentials(credentials)
-                .build();
-        return firestoreOptions.getService();
+            InputStream inStream = this.getClass().getClassLoader().getResourceAsStream(credentialsPath);
+            GoogleCredentials credentials = GoogleCredentials.fromStream(inStream);
+            FirestoreOptions firestoreOptions = FirestoreOptions.getDefaultInstance().toBuilder()
+                    .setProjectId(projectId)
+                    .setCredentials(credentials)
+                    .build();
+            return firestoreOptions.getService();
         } catch (IOException e) {
             throw new RuntimeException("Exception while initializing Firestore", e);
         }
     }
 
     @Bean
-    public UserRepository userRepository(Firestore firestore) {
+    public FsUserRepository fsUserRepository(Firestore firestore) {
         return new FsUserRepository(firestore);
     }
-
-    
-
 }
diff --git a/server/src/main/java/org/vaadin/numerosity/entity/User.java b/server/src/main/java/org/vaadin/numerosity/entity/User.java
new file mode 100644
index 0000000..08ec4bc
--- /dev/null
+++ b/server/src/main/java/org/vaadin/numerosity/entity/User.java
@@ -0,0 +1,55 @@
+package org.vaadin.numerosity.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private String username;
+
+    @Column(nullable = false)
+    private String password;
+
+    public User() {
+    }
+
+    public User(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
diff --git a/server/src/main/java/org/vaadin/numerosity/repository/FsUserRepository.java b/server/src/main/java/org/vaadin/numerosity/repository/FsUserRepository.java
index 2cf6100..39dc5a1 100644
--- a/server/src/main/java/org/vaadin/numerosity/repository/FsUserRepository.java
+++ b/server/src/main/java/org/vaadin/numerosity/repository/FsUserRepository.java
@@ -2,10 +2,18 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-
+import java.util.function.Function;
+
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
+import org.vaadin.numerosity.entity.User;
 import org.vaadin.numerosity.repository.exception.DbException;
 
 import com.google.cloud.firestore.DocumentReference;
@@ -16,9 +24,10 @@ public class FsUserRepository implements UserRepository {
 
     private final Firestore firestore;
 
-    public FsUserRepository(Firestore firestoneClient) { // was Firestore firestoneClient
-        this.firestore = firestoneClient;
+    public FsUserRepository(Firestore firestoreClient) { // Fixed typo
+        this.firestore = firestoreClient;
     }
+    
 
     @Override
     public void createUserDocument(String userId, String username) {
@@ -31,17 +40,15 @@ public void createUserDocument(String userId, String username) {
         userData.put("answered", 0);
         userData.put("unattempted", 0);
         try {
-         docRef.set(userData).get();
-        }  catch (InterruptedException | ExecutionException e) {
+            docRef.set(userData).get();
+        } catch (InterruptedException | ExecutionException e) {
             throw new DbException("Exception while creating user", e);
         }
     }
 
-
     @Override
     public void incrementCorrect(String userId) {
         updateStatistic(userId, "correct", 1);
-
     }
 
     @Override
@@ -49,30 +56,195 @@ public void incrementWrong(String userId) {
         updateStatistic(userId, "wrong", 1);
     }
 
-
-    
     private void updateStatistic(String userId, String field, int delta) {
         DocumentReference docRef = firestore.collection("users").document(userId);
         Map<String, Object> updates = new HashMap<>();
         updates.put(field, FieldValue.increment(delta));
         try {
-             docRef.update(updates).get();
-        }  catch (InterruptedException | ExecutionException e) {
+            docRef.update(updates).get();
+        } catch (InterruptedException | ExecutionException e) {
             throw new DbException("Exception while updating statistic ", e);
         }
     }
 
     @Override
     public Optional<Map<String, Object>> getUserStats(String userId) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getUserStats'");
     }
 
     @Override
     public boolean userExists(String userId) {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'userExists'");
     }
 
-    
+    @Override
+    public void flush() {
+        throw new UnsupportedOperationException("Unimplemented method 'flush'");
+    }
+
+    @Override
+    public <S extends User> S saveAndFlush(S entity) {
+        throw new UnsupportedOperationException("Unimplemented method 'saveAndFlush'");
+    }
+
+    @Override
+    public <S extends User> List<S> saveAllAndFlush(Iterable<S> entities) {
+        throw new UnsupportedOperationException("Unimplemented method 'saveAllAndFlush'");
+    }
+
+    @Override
+    public void deleteAllInBatch(Iterable<User> entities) {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAllInBatch'");
+    }
+
+    @Override
+    public void deleteAllByIdInBatch(Iterable<Long> ids) {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAllByIdInBatch'");
+    }
+
+    @Override
+    public void deleteAllInBatch() {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAllInBatch'");
+    }
+
+    @Override
+    public User getOne(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'getOne'");
+    }
+
+    @Override
+    public User getById(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'getById'");
+    }
+
+    @Override
+    public User getReferenceById(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'getReferenceById'");
+    }
+
+    @Override
+    public <S extends User> List<S> findAll(Example<S> example) {
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+    @Override
+    public <S extends User> List<S> findAll(Example<S> example, Sort sort) {
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+    @Override
+    public List<User> findAll() {
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+    @Override
+    public List<User> findAllById(Iterable<Long> ids) {
+        throw new UnsupportedOperationException("Unimplemented method 'findAllById'");
+    }
+
+    @Override
+    public <S extends User> List<S> saveAll(Iterable<S> entities) {
+        throw new UnsupportedOperationException("Unimplemented method 'saveAll'");
+    }
+
+    @Override
+    public long count() {
+        throw new UnsupportedOperationException("Unimplemented method 'count'");
+    }
+
+    @Override
+    public void delete(User entity) {
+        throw new UnsupportedOperationException("Unimplemented method 'delete'");
+    }
+
+    @Override
+    public void deleteAll() {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAll'");
+    }
+
+    @Override
+    public void deleteAll(Iterable<? extends User> entities) {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAll'");
+    }
+
+    @Override
+    public void deleteAllById(Iterable<? extends Long> ids) {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteAllById'");
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'deleteById'");
+    }
+
+    @Override
+    public boolean existsById(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'existsById'");
+    }
+
+    @Override
+    public Optional<User> findById(Long id) {
+        throw new UnsupportedOperationException("Unimplemented method 'findById'");
+    }
+
+    @Override
+    public <S extends User> S save(S entity) {
+        throw new UnsupportedOperationException("Unimplemented method 'save'");
+    }
+
+
+    @Override
+    public List<User> findAll(Sort sort) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+
+    @Override
+    public Page<User> findAll(Pageable pageable) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+
+    @Override
+    public <S extends User> long count(Example<S> example) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'count'");
+    }
+
+
+    @Override
+    public <S extends User> boolean exists(Example<S> example) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'exists'");
+    }
+
+
+    @Override
+    public <S extends User> Page<S> findAll(Example<S> example, Pageable pageable) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findAll'");
+    }
+
+
+    @Override
+    public <S extends User, R> R findBy(Example<S> example, Function<FetchableFluentQuery<S>, R> queryFunction) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findBy'");
+    }
+
+
+    @Override
+    public <S extends User> Optional<S> findOne(Example<S> example) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findOne'");
+    }
+
+
+    @Override
+    public User findByUsername(String username) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'findByUsername'");
+    }
 }
diff --git a/server/src/main/java/org/vaadin/numerosity/repository/UserRepository.java b/server/src/main/java/org/vaadin/numerosity/repository/UserRepository.java
index c77f3b9..d0a92af 100644
--- a/server/src/main/java/org/vaadin/numerosity/repository/UserRepository.java
+++ b/server/src/main/java/org/vaadin/numerosity/repository/UserRepository.java
@@ -1,13 +1,21 @@
 package org.vaadin.numerosity.repository;
 
-import java.util.Optional;
 import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.vaadin.numerosity.entity.User;
 
-public interface UserRepository {
+public interface UserRepository extends JpaRepository<User, Long> {
 
     void createUserDocument(String userId, String username);
 
-    void incrementCorrect(String userId);
+    @Modifying
+    @Query("UPDATE User u SET u.incrementCorrect = u.incrementCorrect + 1 WHERE u.username = :username")
+    void incrementCorrect(@Param("username") String username);
 
     void incrementWrong(String userId);
 
@@ -15,4 +23,7 @@ public interface UserRepository {
     Optional<Map<String, Object>> getUserStats(String userId);
 
     boolean userExists(String userId);
-}
+
+    User findByUsername(String username);
+
+}
\ No newline at end of file
diff --git a/server/src/main/resources/Firebase.json b/server/src/main/resources/Firebase.json
index 268d867..345227b 100644
--- a/server/src/main/resources/Firebase.json
+++ b/server/src/main/resources/Firebase.json
@@ -1,13 +1 @@
-{
-  "type": "service_account",
-  "project_id": "numerosity-583f5",
-  "private_key_id": "63cd9ba6d360b4de2504b66deb60787f5b2a894c",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkO24JuX5O5Ofx\n8pzh8R1ZnTsExnj+rAj6JA8pwMCBJ7EA0zoDA/OAngO1x9mME2AUAvSMvh3OwENb\nRvRtlTm7bBeSkHPPk/msZiJ0zDbTtakNWAoVHg9Tn3YQbwvpJE+CSOPTe3E6dCHm\nV4i+EJmuCnV/2xZSgi3Ad6IEVnkBZG2AFwIRH2VoHiUtv14aScSqyL5i9orzhNY5\nmabZ8zwIH/Rtd2+4+fWTDNHdfJvGh7fDFrAkEKQWimX0uHytIVn/FeVqlUpjY9WC\nFZHgX4aKIhLAfNzgxPeyxXVYRZVTTyZq/LypJsIoFyS5LPGCamL8aaiIZv5L4Yg5\nb1Q7usyXAgMBAAECggEAFR+A+CpwS7n405Y6OdkYd85LA46g7SUb8Za7xof96RY0\n1hg2ksffVgSJ4F2eP04dwsxhONNxq8x0j3KaNbgtbzC6X8i5xzjxTyjmwHuUCXUT\nL9Z5nGm7TmiAQ1YbupivOSYo285ddOUBrDFmyPx9VLPIGyy6PKmqtVj9KDyel2e4\nwCD+NuCT1awvgA3NknZD6ABItvK+2Yd7LpC+Ljd8RuxWg1xkNHBgyFRuFoqv1Fu3\nzO1vK/TMiSE03jZgRDzS5jj/ppujaj3yKKBm2EJzwqptZVIm7aP08sBMozC/AtWc\nbFu0PL35WylWQTngodCqtIadJbh90kPSpixCS3OU0QKBgQD/zU4EPyfOTk3/7fiN\nXZhH1TWSLviQROhMAEnMDHCraZVG5sWtpGub6po5KT8bjTerFEgsqzJftM8AJcfn\n9dxikjwB8/5yDMJGxJl2t6qGyDWWE+4I73pXahgfjNy49sg2I2WlGKPClxaRDz92\n/DN5HGDGf83CupESOvgTeYPrUQKBgQDkaKlHxTrQuPMbFqe/GtyQeEqyLQ0IvwP/\ns7u+Zl9zKdZl34q3AiaZRk9WQIVncnUe6N9D31hut6HHXuo61WaOf9O18I1ZB4A4\nFp8C99y8Lkz3lpvb6DjailbL7er5HxH0OinRIAYmKHM2LM14riDxzT1WbGN7TxDn\nBYoJNO9vZwKBgQDBVe26XfV7A0oGvljWl7/pwua7dw7dE4ezMaCVPW3G0IVH0lHk\nHNpMPLOVsmwFKeXCQxEN2dK37VNq3CNMWVHZmocKPty4XJZVoHAQ/14+goGlzahi\nToXcHc7fwbptfe/yoyxG7OmQwFsJBkpEZveMePtX6+6bWCEfczxek8A2EQKBgHct\n9UYxr2LBXng/9f9NcNEhMziNMUPjB58glVHf8OYSaoB1h9e+E43elf8XY4R6wIoE\nUJsFqwr6Xju9VtKkDwNDx6AjiF1wAINDqmzOECtQrXBy8ZhpL2E41dlKp1Sd1axt\nvOwVnZ/Dc3pNHlld4mrJALxbif0JYHRq+3+aU2T5AoGBAJbLFNwlcERqiGXW5Ex5\nvLoQTcCHIM2GxfS4mXWH5HLr1ySPLMlDkQkszlVQwG4gDz7l227l+JmZtdpIxoVh\nphpQvLJ39yvFwLOq0fxNTd4yuVYsxywJLKE8gOkpTq/mbA0AD2RJ9m7VnHXW0dK/\nTScQkwjBNJ59UWUeqWr79KDI\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-fbsvc@numerosity-583f5.iam.gserviceaccount.com",
-  "client_id": "110420850814369066436",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-fbsvc%40numerosity-583f5.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}
+PLEASE ENTER YOUR API KEY HERE!
\ No newline at end of file