diff --git a/.gitignore b/.gitignore
index 99712178bf..ce2afa0a8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Class files
+*.class
+
 # IDEA files
 /.idea/
 /out/
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 5d313334cc..3887f2ed58 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -1,10 +1,27 @@
+import java.util.Scanner;
+
 public class Duke {
+    //@@author Parcly-Taxel
+    /**
+      * Pretty-prints a line of prompt to the user.
+      */
+    public static void printPrompt(String prompt) {
+        System.out.println("    " + prompt);
+    }
+    
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
+        Scanner sc = new Scanner(System.in);
+        printPrompt("Hello! I'm Duke");
+        printPrompt("What can I do for you?");
+        
+        while (true) {
+            String cmd = sc.nextLine();
+            if (cmd.equals("bye")) {
+                break;
+            }
+            printPrompt(cmd);
+        }
+        
+        printPrompt("Bye. Hope to see you again soon!");
     }
 }