diff --git a/data/taskList.txt b/data/taskList.txt
index 5ad3c174f2..2e7aee6981 100644
--- a/data/taskList.txt
+++ b/data/taskList.txt
@@ -1,4 +1,4 @@
 T | 0 |  read book
 D | 0 | return book | 2022-09-20
 T | 0 |  gym
-T | 0 |  finish coding
+T | 0 |  code
diff --git a/src/main/java/jarvis/MainWindow.java b/src/main/java/jarvis/MainWindow.java
index af44befce9..dde9a9cb4d 100644
--- a/src/main/java/jarvis/MainWindow.java
+++ b/src/main/java/jarvis/MainWindow.java
@@ -1,6 +1,7 @@
 package jarvis;
 
 import jarvis.exception.JarvisException;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ScrollPane;
@@ -29,6 +30,7 @@ public class MainWindow extends AnchorPane {
     @FXML
     public void initialize() {
         scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
+        dialogContainer.getChildren().add(DialogBox.getDukeDialog(Parser.introduction(), jarvisImage));
     }
 
     public void setJarvis(Jarvis j) {
@@ -47,6 +49,9 @@ private void handleUserInput() throws JarvisException {
                 DialogBox.getUserDialog(input, userImage),
                 DialogBox.getDukeDialog(response, jarvisImage)
         );
+        if (response.equals("Goodbye, have a good day.")) {
+            Platform.exit();
+        }
         userInput.clear();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/jarvis/Parser.java b/src/main/java/jarvis/Parser.java
index c338f4325e..72e28d0927 100644
--- a/src/main/java/jarvis/Parser.java
+++ b/src/main/java/jarvis/Parser.java
@@ -3,8 +3,6 @@
 import jarvis.task.*;
 import jarvis.exception.JarvisException;
 
-import java.util.Scanner;
-
 public class Parser {
     
     private static String introduction = "Hello. I am Jarvis \n"
@@ -118,5 +116,9 @@ public String readCommand(String input) throws JarvisException {
                 return "I'm sorry, but I don't know what that means";
             }
     }
+
+    public static String introduction() {
+        return introduction;
+    }
 }