diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
index 8c7f62c..e1ed1af 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -1,5 +1,9 @@
 package ntnu.systemutvikling.team6;
 
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseManager;
 import ntnu.systemutvikling.team6.models.Charity;
@@ -10,13 +14,24 @@
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 
-public class HmHApplication {
-  public static void main(String[] args) {
-    System.out.println("Hello world!");
-    init();
+import static javafx.application.Application.launch;
+
+public class HmHApplication extends Application {
+  @Override
+  public void start(Stage stage) throws Exception {
+    FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/fxml/frontPage.fxml"));
+    Scene scene = new Scene(fxmlLoader.load());
+    stage.setTitle("Help Me Help");
+    stage.setScene(scene);
+
+    stage.setMinHeight(700);
+    stage.setMinWidth(1100);
 
+    stage.show();
   }
-  public static void init(){
+
+  @Override
+  public void init(){
     /* Test and create tables to MySQL if ain't any */
     try {
       DatabaseManager db = new DatabaseManager();
@@ -42,4 +57,8 @@ public static void init(){
       e.printStackTrace();
     }
   }
+  public static void main(String[] args) {
+    System.out.println("Hello world!");
+    launch(args);
+  }
 }
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java
index 35a9e0d..e3e2ee5 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java
@@ -5,22 +5,8 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-public class Main extends Application {
-
-  @Override
-  public void start(Stage stage) throws Exception {
-    FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/fxml/frontPage.fxml"));
-    Scene scene = new Scene(fxmlLoader.load());
-    stage.setTitle("Help Me Help");
-    stage.setScene(scene);
-
-    stage.setMinHeight(700);
-    stage.setMinWidth(1100);
-
-    stage.show();
-  }
-
-  public static void main(String[] args) {
-    launch(args);
-  }
+public class Main  {
+    public static void main(String[] args) {
+      HmHApplication.main(args);
+    }
 }