diff --git a/.gitignore b/.gitignore
index f69985ef1f..06ab08e3b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ bin/
 
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
+/data/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..d95fb9d6e5
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,63 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+
+    String javaFxVersion = '11'
+
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+
+}
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+
+        showExceptions true
+        exceptionFormat "full"
+        showCauses true
+        showStackTraces true
+        showStandardStreams = false
+    }
+}
+
+application {
+    mainClassName = "duke.Launcher"
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveClassifier = null
+}
+
+checkstyle {
+    toolVersion = '8.29'
+}
+
+run{
+    standardInput = System.in
+}
diff --git a/docs/README.md b/docs/README.md
index 8077118ebe..0f8eadd0d2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,29 +1,246 @@
 # User Guide
 
+Duke is a chatbot that helps you keep track of tasks in the form of ToDo, Deadline and Event. 
+
 ## Features 
 
-### Feature-ABC
+### Adding a new Task
+
+#### `ToDo`
+
+This adds a new ToDo task to the list.
+
+Format:
+
+`todo <DESCRIPTION>`
+
+Example Usage:
+
+```
+todo read book 
+```
+
+Expected Output:
+
+A new todo task is added to the task list.
+```
+  Got it. I just added the task: 
+  [T][ ] read book 
+  Now you have 1 tasks in the list.
+```
+
+#### `Deadline`
+
+This adds a new Deadline task to the list 
+
+Format: 
+`deadline <DESCRIPTION> /by <TIME>`
+
+Example Usage:
+
+```
+deadline ip /by 22/09/2022 2359
+```
+
+Expected Output:
+
+A new deadline task is added to the task list.
+```
+  Got it. I just added the task: 
+  [D][ ] ip (by: Sep 22 2022, 2359)
+  Now you have 2 tasks in the list.
+```
+
+#### `Event`
+
+This adds a new Event task to the list 
+
+
+Format: 
+`event <DESCRIPTION> /at <TIME>`
 
-Description of the feature.
+Example Usage:
 
-### Feature-XYZ
+```
+event meeting /at 22/09/2022 1600
+```
+
+Expected Outcome:
+
+A new event task is added to the task list.
+```
+  Got it. I just added the task: 
+  [E][ ] meeting (at: Sep 22 2022, 1600)
+  Now you have 2 tasks in the list.
+```
+
+### Marking a task 
+
+#### `Mark`
+
+Marks a task as done in the task list 
+
+Format:
+
+`mark <TASK_ID>`
+
+Example Usage:
+
+```
+mark 1 
+```
+Expected Outcome:
 
-Description of the feature.
+If the first task exists in the task list it is marked as done.
+```
+ Excellent! I have marked the task as done: 
+ [T][X] read book 
+```
 
-## Usage
 
-### `Keyword` - Describe action
+#### `Unmark`
 
-Describe the action and its outcome.
+Marks a task in the task list as not done. 
 
-Example of usage: 
+Format:
 
-`keyword (optional arguments)`
+`unmark <TASK_ID>`
 
-Expected outcome:
+Example Usage:
 
-Description of the outcome.
+```
+unmark 1 
+```
+
+Expected Outcome:
 
+If the first task exists in the task list it is marked as  not done.
 ```
-expected output
+ Noted! I have marked the task as not done yet: 
+ [T][] read book 
 ```
+
+
+### Deleting a Task: 
+
+#### `Delete`
+
+Deletes a task from the task list 
+
+Format:
+
+`delete <TASK_ID>`
+
+Example Usage:
+
+```
+delete 1 
+```
+
+Expected Outcome:
+
+If the first task exists in the list it is deleted. 
+```
+ Noted. I've remove this task: 
+ [T][X] read book 
+ Now you have 2 tasks in the list.
+```
+
+### List 
+
+List all the task in the task list 
+
+Example Usage: 
+
+```
+list
+```
+
+Expected Outcome:
+
+List all the task from the task list. 
+```
+  1. [E][ ] meeting (at: Sep 22 2022)
+  2. [D][ ] ip (by: Sep 22 2022)
+```
+
+
+### Searching for a Task 
+
+#### `Find`
+
+Given a keyowrd, return all the tasks from the task list containing the keyword
+
+Format:
+
+`find <kKEYWORD>`
+
+Example Usage:
+
+```
+find read
+```
+
+Expected Outcome:
+
+All tasks which contain the word read are showm. 
+```
+[T][] read book 
+```
+
+### Help 
+
+#### `help`
+
+Display a list of all the commands in the application. 
+
+Example Usage:
+
+```
+help
+```
+Expected Outcome:
+
+Shows the list of all the available commands. 
+
+### Exit the Program 
+
+#### `Bye`
+
+Terminates the execution of the program 
+
+Example Usage:
+
+```
+bye
+```
+Expected Outcome:
+
+Exits the application. 
+```
+Bye. Looking forward to chating with you soon again!
+```
+
+
+## Command Summary
+
+|Action|Format|Example|
+|:-|:-|:-|
+|ToDo|`todo <DESCRIPTION>`|`todo Play Games`|
+|Deadline|`deadline <DESCRIPTION> /by <TIME>`|`deadline project submission /by 19/10/2022 2359`|
+|Event|`event <DESCRIPTION> /at <TIME>`|`event Go to Singapore Zoo /at 10/12/2022 1000`|
+|Mark|`mark <TASK_ID>`|`mark 3`|
+|Unmark|`unmark <TASK_ID>`|`unmark 4`|
+|Delete|`delete <TASK_ID>`|`delete 1`|
+|List|`list`|`list`|
+|Find|`find <KEYWORD>`|`find read book`|
+|Help|`help`|`help`|
+|Exit|`bye`|`bye`|
+
+## UI Screenshot 
+
+<p align="center">
+<img alt="UI" src="Ui.png">
+</p>
+
+
diff --git a/docs/Ui.png b/docs/Ui.png
new file mode 100644
index 0000000000..69cb51aae2
Binary files /dev/null and b/docs/Ui.png differ
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..f3d88b1c2f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..b7c8c5dbf5
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000000..2fe81a7d95
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..62bd9b9cce
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,103 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
deleted file mode 100644
index 5d313334cc..0000000000
--- a/src/main/java/Duke.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class Duke {
-    public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
-    }
-}
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
new file mode 100644
index 0000000000..3f6e769873
--- /dev/null
+++ b/src/main/java/duke/Duke.java
@@ -0,0 +1,47 @@
+package duke;
+
+import duke.commands.Command;
+import duke.parser.Parser;
+import duke.ui.Ui;
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+
+
+/**
+ * Initalises and runs the duke program
+ */
+public class Duke {
+
+	private Ui ui;
+	private Storage storage;
+	private TaskList taskList;
+
+	/**
+	 * Set up the Ui, Storage and TaskList
+	 */
+	public Duke() {
+		ui = new Ui();
+		storage = new Storage();
+		taskList = new TaskList(storage.convertToTaskList());
+	}
+
+	public String getResponse(String input) {
+		try {
+			Command command = Parser.parse(input);
+			return command.execute(taskList, ui, storage);
+		} catch (DukeException e) {
+			return e.getMessage();
+		}
+	}
+
+	public String getTaskList() {
+
+		String text = "Here are your tasks: \n";
+		text += this.taskList.taskListString();
+		return text;
+	}
+}
+
+
+
+
diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java
new file mode 100644
index 0000000000..0b64e3e086
--- /dev/null
+++ b/src/main/java/duke/DukeException.java
@@ -0,0 +1,13 @@
+package duke;
+
+/**
+ * Represents an error that might occur during the programs execution.
+ */
+public class DukeException extends RuntimeException {
+
+    public DukeException(String message) {
+
+        super(message);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java
new file mode 100644
index 0000000000..8ddcbb8986
--- /dev/null
+++ b/src/main/java/duke/Launcher.java
@@ -0,0 +1,11 @@
+package duke;
+
+import duke.ui.Main;
+import javafx.application.Application;
+
+
+public class Launcher {
+    public static void main(String[] args) {
+        Application.launch(Main.class, args);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/AddCommand.java b/src/main/java/duke/commands/AddCommand.java
new file mode 100644
index 0000000000..701810ad5d
--- /dev/null
+++ b/src/main/java/duke/commands/AddCommand.java
@@ -0,0 +1,38 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.tasks.Task;
+import duke.ui.Ui;
+
+
+/**
+ * Adds a task to the tasklist.
+ */
+public class AddCommand extends Command {
+
+    protected Task task;
+    private final String MESSAGE = "Got it. I just added the " +
+            "task: ";
+
+    /**
+     * Constructs an add command
+     *
+     * @param task the task to be added
+     */
+    public AddCommand(Task task) {
+        this.task = task;
+    }
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        taskList.addTask(task);
+        storage.saveTaskList(taskList);
+        String text = MESSAGE + "\n" + task.toString() + "\n" +
+                taskList.displayNumTasks();
+        return ui.displayMessage(text);
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/Command.java b/src/main/java/duke/commands/Command.java
new file mode 100644
index 0000000000..7aa2359944
--- /dev/null
+++ b/src/main/java/duke/commands/Command.java
@@ -0,0 +1,23 @@
+package duke.commands;
+
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+import duke.storage.Storage;
+
+/**
+ * Represents a command given to duke
+ */
+public abstract class Command {
+
+    /**
+     * Executes the given command
+     * @param taskList list of tasks
+     * @param ui duke ui
+     * @param storage storage file
+     * @return
+     */
+    public abstract String execute(TaskList taskList, Ui ui, Storage storage);
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/DeleteCommand.java b/src/main/java/duke/commands/DeleteCommand.java
new file mode 100644
index 0000000000..e35c4cb34a
--- /dev/null
+++ b/src/main/java/duke/commands/DeleteCommand.java
@@ -0,0 +1,43 @@
+package duke.commands;
+
+import duke.DukeException;
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.tasks.Task;
+import duke.ui.Ui;
+
+
+/**
+ * Deletes a command from the tasklist.
+ */
+public class DeleteCommand extends Command {
+
+    protected int index;
+    private final String MESSAGE = "Noted. I've remove this task: ";
+    private final String OUT_OF_BOUNDS_ERROR = "Please enter a positive integer " +
+            "less than ";
+
+    /**
+     * Constructs a delete command
+     *
+     * @param index index of the task to be deleted
+     */
+    public DeleteCommand(int index) {
+        this.index = index;
+    }
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        try {
+            Task task = taskList.deleteTask(index);
+            storage.saveTaskList(taskList);
+            String text = MESSAGE + "\n" + task.toString() +
+                    "\n" + taskList.displayNumTasks();
+            return ui.displayMessage(text);
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(OUT_OF_BOUNDS_ERROR + taskList.getSize() + ".");
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/ExitCommand.java b/src/main/java/duke/commands/ExitCommand.java
new file mode 100644
index 0000000000..eb15adba17
--- /dev/null
+++ b/src/main/java/duke/commands/ExitCommand.java
@@ -0,0 +1,20 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+
+/**
+ * Exits the program execution
+ */
+public class ExitCommand extends Command {
+
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        storage.saveTaskList(taskList);
+        return ui.displayExitMessage();
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/FindCommand.java b/src/main/java/duke/commands/FindCommand.java
new file mode 100644
index 0000000000..4ce039831d
--- /dev/null
+++ b/src/main/java/duke/commands/FindCommand.java
@@ -0,0 +1,37 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+/**
+ * Represents a class to search for tasks in the tasklist using keyword
+ */
+public class FindCommand extends  Command {
+
+    protected String search;
+    private static final String MESSAGE = "Here are the mathces from " +
+            "your list:\n";
+    private final String NO_MATCH = "You currently have no tasks matching that " +
+            "description";
+
+    /**
+     * Constructs a find command.
+     * @param search the keyword to search for.
+     */
+    public FindCommand(String search) {
+        this.search = search;
+    }
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        TaskList searchMatchList = new TaskList(taskList.findTasks(search));
+        if (searchMatchList.getSize() == 0) {
+            return ui.displayMessage(NO_MATCH);
+        }
+        return ui.displayMessage(MESSAGE + searchMatchList.taskListString());
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/HelpCommand.java b/src/main/java/duke/commands/HelpCommand.java
new file mode 100644
index 0000000000..bc1c7eaef6
--- /dev/null
+++ b/src/main/java/duke/commands/HelpCommand.java
@@ -0,0 +1,29 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+/**
+ * Represents a help command
+ */
+public class HelpCommand extends Command {
+
+    private final String HELP_MESSAGE = "Given below are the commands that can be " +
+            "executed using duke:\n"
+            + "1. \"list\": It list all the tasks currently stored in duke.\n"
+            + "2. \"todo <description>\": Adds a Todo task.\n"
+            + "3. \"deadline <description> /by <dd/mm/YYYY HHmm>\":Adds a new Deadline task.\n"
+            + "4. \"event <description> /at <dd/mm/YYYY HHmm>\":Adds a new Event task.\n"
+            + "5. \"mark <task number>\": Marks the test as being done.\n"
+            + "6. \"unmark <task number>\": Marks the test as being not done.\n"
+            + "7. \"delete <task number>\": Deletes the given task.\n"
+            + "8. \"find <keyword(s)>\": Finds tasks in the list matching the keyword(s).\n"
+            + "9. \"help\": list all the commands in the application";
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        return ui.displayMessage(HELP_MESSAGE);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/ListCommand.java b/src/main/java/duke/commands/ListCommand.java
new file mode 100644
index 0000000000..9b12d6af53
--- /dev/null
+++ b/src/main/java/duke/commands/ListCommand.java
@@ -0,0 +1,18 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+/**
+ * Represents the list of task in the task list
+ */
+public class ListCommand extends Command {
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+
+        return ui.displayMessage(taskList.taskListString());
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/MarkCommand.java b/src/main/java/duke/commands/MarkCommand.java
new file mode 100644
index 0000000000..e592100f15
--- /dev/null
+++ b/src/main/java/duke/commands/MarkCommand.java
@@ -0,0 +1,42 @@
+package duke.commands;
+
+import duke.DukeException;
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+
+/**
+ * Sets a task in the list as done
+ */
+public class MarkCommand extends Command {
+
+    protected int index;
+    private final String MESSAGE = "Excellent! I have marked " +
+            "the task as done: ";
+    private final String OUT_OF_BOUNDS_ERROR = "Please enter a positive integer " +
+            "less than ";
+
+
+    /**
+     * Constrcuts a mark command
+     *
+     * @param index index of the task in the task list to be marked as done
+     */
+    public MarkCommand(int index) {
+        this.index = index;
+    }
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        try {
+            taskList.markTask(index);
+            storage.saveTaskList(taskList);
+            String text = MESSAGE + "\n " + taskList.getTaskString(index);
+            return ui.displayMessage(text);
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(OUT_OF_BOUNDS_ERROR + taskList.getSize() + ".");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/UnknownCommand.java b/src/main/java/duke/commands/UnknownCommand.java
new file mode 100644
index 0000000000..61dba6d3f1
--- /dev/null
+++ b/src/main/java/duke/commands/UnknownCommand.java
@@ -0,0 +1,23 @@
+package duke.commands;
+
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+/**
+ * Represents an unknown command for an
+ * input command that is not recognised
+ */
+public class UnknownCommand extends Command {
+
+    private static final String UNKNOWN_COMMAND_MESSAGE = "I am really sorry, I do " +
+            "not understand this command.\n"
+            + "For the list of commands available please type \"help\"";
+
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        return ui.displayMessage(UNKNOWN_COMMAND_MESSAGE);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/commands/UnmarkCommand.java b/src/main/java/duke/commands/UnmarkCommand.java
new file mode 100644
index 0000000000..66c2df5e36
--- /dev/null
+++ b/src/main/java/duke/commands/UnmarkCommand.java
@@ -0,0 +1,41 @@
+package duke.commands;
+
+import duke.DukeException;
+import duke.storage.Storage;
+import duke.tasks.TaskList;
+import duke.ui.Ui;
+
+import java.io.IOException;
+
+/**
+ * Sets a task as not done in the task list
+ */
+public class UnmarkCommand extends Command {
+
+    protected int index;
+    private final String MESSAGE =  "Noted! I have marked " +
+            "the task as not done yet:";
+    private final String OUT_OF_BOUNDS_ERROR = "Please enter a positive integer " +
+            "less than ";
+
+    /**
+     * Construct an unmark command
+     *
+     * @param index index of the task to marked as not done in task list
+     */
+    public UnmarkCommand(int index) {
+        this.index = index;
+    }
+    @Override
+    public String execute(TaskList taskList, Ui ui, Storage storage) {
+        try {
+            taskList.unmarkTask(index);
+            storage.saveTaskList(taskList);
+            String text = MESSAGE + "\n " + taskList.getTaskString(index);
+            return ui.displayMessage(text);
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(OUT_OF_BOUNDS_ERROR + taskList.getSize() + ".");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/out/artifacts/duke_jar/duke.jar b/src/main/java/duke/out/artifacts/duke_jar/duke.jar
new file mode 100644
index 0000000000..8d49b3a5ba
Binary files /dev/null and b/src/main/java/duke/out/artifacts/duke_jar/duke.jar differ
diff --git a/src/main/java/duke/out/production/duke/.idea/.gitignore b/src/main/java/duke/out/production/duke/.idea/.gitignore
new file mode 100644
index 0000000000..26d33521af
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/src/main/java/duke/out/production/duke/.idea/artifacts/duke_jar.xml b/src/main/java/duke/out/production/duke/.idea/artifacts/duke_jar.xml
new file mode 100644
index 0000000000..4b9713410b
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/.idea/artifacts/duke_jar.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="duke:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/duke_jar</output-path>
+    <root id="archive" name="duke.jar">
+      <element id="module-output" name="duke" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/src/main/java/duke/out/production/duke/.idea/misc.xml b/src/main/java/duke/out/production/duke/.idea/misc.xml
new file mode 100644
index 0000000000..1763e153b6
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/duke/out/production/duke/.idea/modules.xml b/src/main/java/duke/out/production/duke/.idea/modules.xml
new file mode 100644
index 0000000000..b7a0289b8f
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/duke.iml" filepath="$PROJECT_DIR$/duke.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/duke/out/production/duke/.idea/vcs.xml b/src/main/java/duke/out/production/duke/.idea/vcs.xml
new file mode 100644
index 0000000000..4fce1d86b4
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/duke/out/production/duke/META-INF/MANIFEST.MF b/src/main/java/duke/out/production/duke/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..2c9a9745c5
--- /dev/null
+++ b/src/main/java/duke/out/production/duke/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: duke.Duke
+
diff --git a/src/main/java/duke/parser/Parser.java b/src/main/java/duke/parser/Parser.java
new file mode 100644
index 0000000000..4fb17846ab
--- /dev/null
+++ b/src/main/java/duke/parser/Parser.java
@@ -0,0 +1,142 @@
+package duke.parser;
+
+import duke.DukeException;
+import duke.commands.*;
+import duke.tasks.Deadline;
+import duke.tasks.Event;
+import duke.tasks.ToDo;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+/**
+ * Represents a parser to extract information
+ * from user input
+ */
+public class Parser {
+
+    private static final String NUMBER_FORMAT_ERROR = "Please enter an integer";
+    private static final  String MISSING_DESCRIPTION = "Invalid format! Missing description, please use the " +
+            "following format:\n";
+    private static final String INCORRECT_DATE_FORMAT = "Please enter the datetime in the following format:\n" +
+            "<dd/mm/YYYY HHmm>";
+    private static final String DEADLINE_FORMAT = "deadline <description> /by <dd/mm/YYYY HHmm>";
+    private static final String EVENT_FORMAT = "event <description> /at <dd/mm/YYYY HHmm>";
+    private static final String TODO_FORMAT = "todo <description>";
+    private static final String FIND_ERROR = "Invalid format! Missing keyword!\n" +
+            "Please use the following format:\nfind <keyword>";
+
+    /**
+     * Parses the user input into various commands
+     *
+     * @param command a string representing the user input
+     * @return A command corresponding to the user input
+     */
+    public static Command parse(String command) {
+        String[] input = command.split(" ", 2);
+
+        String commandType = input[0].toLowerCase();
+
+        switch (commandType) {
+        case "bye":
+            return new ExitCommand();
+        case "list":
+            return new ListCommand();
+        case "mark":
+            return parseMark(input);
+        case "unmark":
+            return parseUnmark(input);
+        case "deadline":
+            return parseDeadline(input);
+        case "event":
+            return parseEvent(input);
+        case "todo":
+            return parseToDo(input);
+        case "delete":
+            return parseDelete(input);
+        case "find":
+            return parseFind(input);
+        case "help":
+            return new HelpCommand();
+        default:
+            return new UnknownCommand();
+        }
+    }
+
+    private static Command parseMark(String[] input) {
+        try {
+            return new MarkCommand(Integer.parseInt(input[1].trim()) - 1);
+        } catch (NumberFormatException e) {
+            throw new DukeException(NUMBER_FORMAT_ERROR);
+        }
+    }
+
+    private static Command parseUnmark(String[] input) {
+        try {
+            return new UnmarkCommand(Integer.parseInt(input[1].trim()) - 1);
+        } catch (NumberFormatException e) {
+            throw new DukeException(NUMBER_FORMAT_ERROR);
+        }
+    }
+
+    private static Command parseDelete(String[] input) {
+        try {
+            return new DeleteCommand(Integer.parseInt(input[1].trim()) - 1);
+        } catch (NumberFormatException e) {
+            throw new DukeException(NUMBER_FORMAT_ERROR);
+        }
+    }
+
+    private static Command parseDeadline(String[] input) {
+        try {
+            String[] deadline = input[1].split(" /by ");
+            LocalDateTime by = LocalDateTime.parse(deadline[1],
+                    DateTimeFormatter.ofPattern("d/M/y HHmm"));
+            String description = deadline[0];
+            return new AddCommand(new Deadline(description, by));
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(MISSING_DESCRIPTION + DEADLINE_FORMAT);
+        } catch (DateTimeParseException e) {
+            throw new DukeException(INCORRECT_DATE_FORMAT);
+        }
+    }
+
+    private static Command parseEvent(String[] input) {
+        try {
+            String[] event = input[1].split(" /at ");
+            LocalDateTime at = LocalDateTime.parse(event[1],
+                    DateTimeFormatter.ofPattern("d/M/y HHmm"));
+            String description = event[0];
+            return new AddCommand(new Event(description, at));
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(MISSING_DESCRIPTION + EVENT_FORMAT);
+        } catch (DateTimeParseException e) {
+            throw new DukeException(INCORRECT_DATE_FORMAT);
+        }
+    }
+
+    private static Command parseToDo(String[] input) {
+        try {
+            String description = input[1].trim();
+            if (description.equals("")) {
+                throw new DukeException(MISSING_DESCRIPTION + TODO_FORMAT);
+            }
+            return new AddCommand(new ToDo(description));
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(MISSING_DESCRIPTION + TODO_FORMAT);
+        }
+    }
+
+    private static Command parseFind(String[] input) {
+        try {
+            String search = input[1].trim();
+            if (search.equals("")) {
+                throw new DukeException(FIND_ERROR);
+            }
+            return new FindCommand(search);
+        } catch (IndexOutOfBoundsException e) {
+            throw new DukeException(FIND_ERROR);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java
new file mode 100644
index 0000000000..11769649cf
--- /dev/null
+++ b/src/main/java/duke/storage/Storage.java
@@ -0,0 +1,105 @@
+package duke.storage;
+
+import duke.DukeException;
+import duke.tasks.Deadline;
+import duke.tasks.Event;
+import duke.tasks.Task;
+import duke.tasks.TaskList;
+import duke.tasks.ToDo;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Scanner;
+
+/**
+ * Represents a class to store the task list in a text file.
+ */
+public class Storage {
+
+    private final File DATA_DIRECTORY = new File("data");
+    private final File DATA_FILEPATH = new File("data/duke.txt");
+
+    /**
+     * Constructs a storage to store the text file
+     *
+     * @throws IOException if there is an error in creating the file
+     */
+    public Storage() {
+        if(!DATA_DIRECTORY.exists()) {
+            DATA_DIRECTORY.mkdir();
+        }
+
+        try {
+            DATA_FILEPATH.createNewFile();
+        } catch (IOException e) {
+            System.out.println("Couldn't create a new file.");
+        }
+    }
+
+    /**
+     * Retrives the task stored in the text file
+     * @returns a list of task stored in an arraylist.
+     */
+    public ArrayList<Task> convertToTaskList() {
+
+        ArrayList<Task> taskList = new ArrayList<Task>();
+
+        try {
+            Scanner sc = new Scanner(DATA_FILEPATH);
+            while(sc.hasNextLine()) {
+
+                String task = sc.nextLine();
+                String[] description = task.split(" \\| ");
+
+                boolean isDone = description[1].equals("1");
+
+                switch (description[0]) {
+
+                case "T":
+                    taskList.add(new ToDo(description[2], isDone));
+                    break;
+                case "D":
+                    taskList.add(new Deadline(description[2], isDone, description[3]));
+                    break;
+                case "E":
+                    taskList.add(new Event(description[2], isDone, description[3]));
+                    break;
+                default:
+                    break;
+                }
+            }
+        } catch(FileNotFoundException e) {
+            System.out.println("There was an error while opening the file");
+        }
+
+
+        return taskList;
+
+    }
+
+    /**
+     * Stores the task in task list in a text file
+     * @param taskList the list of tasks in the tasklist array .
+     * @throws IOException when there is an error while writing to the text file.
+     */
+    public void saveTaskList(TaskList taskList) {
+
+        try {
+            FileWriter fw = new FileWriter(DATA_FILEPATH);
+            fw.write(taskList.taskListFileString());
+            fw.close();
+        } catch (IOException e) {
+            System.out.println("Your data couldn't be saved");
+        }
+
+    }
+
+
+
+
+}
diff --git a/src/main/java/duke/tasks/Deadline.java b/src/main/java/duke/tasks/Deadline.java
new file mode 100644
index 0000000000..889674be90
--- /dev/null
+++ b/src/main/java/duke/tasks/Deadline.java
@@ -0,0 +1,41 @@
+package duke.tasks;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Represetns a deadline task.
+ */
+public class Deadline extends Task {
+
+    protected LocalDateTime completeBy;
+
+    public Deadline(String description, LocalDateTime completeBy) {
+        super(description, false);
+        this.completeBy = completeBy;
+    }
+
+    public Deadline(String description, boolean isDone, String completeBy) {
+
+        super(description, isDone);
+        this.completeBy = LocalDateTime.parse(completeBy,
+                DateTimeFormatter.ofPattern("d/M/y HHmm"));
+    }
+
+    @Override
+    public String fileString() {
+
+        return "D" + super.fileString() + " | " +
+                completeBy.format(DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"));
+    }
+
+    @Override
+    public String toString() {
+
+        return "[D]" + super.toString() + " (by: " +
+                completeBy.format(DateTimeFormatter.ofPattern("MMM d yyyy, HHmm"))
+                + ")";
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/tasks/Event.java b/src/main/java/duke/tasks/Event.java
new file mode 100644
index 0000000000..e268609f76
--- /dev/null
+++ b/src/main/java/duke/tasks/Event.java
@@ -0,0 +1,43 @@
+package duke.tasks;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Represents an event task
+ */
+public class Event extends Task {
+
+    private LocalDateTime eventAt;
+
+    public Event(String description, LocalDateTime eventAt) {
+
+        super(description, false);
+        this.eventAt = eventAt;
+    }
+
+    public Event(String description, boolean isDone, String eventAt) {
+
+        super(description, isDone);
+        this.eventAt = LocalDateTime.parse(eventAt,
+                DateTimeFormatter.ofPattern("d/M/y HHmm"));;
+
+    }
+
+    @Override
+    public String fileString() {
+
+        return "E" + super.fileString() + " | " +
+        eventAt.format(DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"));
+    }
+
+    @Override
+    public String toString() {
+
+        return "[E]" + super.toString() + " (at: " +
+                eventAt.format(DateTimeFormatter.ofPattern("MMM d yyyy, HHmm"))
+                + ")";
+
+    }
+
+}
diff --git a/src/main/java/duke/tasks/Task.java b/src/main/java/duke/tasks/Task.java
new file mode 100644
index 0000000000..e40948b985
--- /dev/null
+++ b/src/main/java/duke/tasks/Task.java
@@ -0,0 +1,49 @@
+package duke.tasks;
+
+/**
+ * Represents a generic task.
+ */
+public class Task {
+
+    protected String description;
+    protected boolean isDone;
+
+    public Task(String description) {
+        this.description = description;
+        this.isDone = false;
+    }
+
+    public Task(String description, boolean isDone) {
+
+        this.description = description;
+        this.isDone = isDone;
+    }
+
+    public String getStatusIcon() {
+        return (isDone ? "X" : " "); // mark done task with X
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDone(boolean done) {
+
+        this.isDone = done;
+    }
+
+
+    public String fileString() {
+
+        return " | " + (this.isDone ? 1 : 0) + " | " +
+                this.description;
+    }
+
+    @Override
+    public String toString() {
+
+        return "[" + this.getStatusIcon() + "] " + this.description;
+    }
+
+
+}
diff --git a/src/main/java/duke/tasks/TaskList.java b/src/main/java/duke/tasks/TaskList.java
new file mode 100644
index 0000000000..2e3645658d
--- /dev/null
+++ b/src/main/java/duke/tasks/TaskList.java
@@ -0,0 +1,89 @@
+package duke.tasks;
+
+import java.util.ArrayList;
+
+/**
+ * Represents a list of all the tasks.
+ */
+public class TaskList {
+
+    private ArrayList<Task> taskList;
+
+    public TaskList(ArrayList<Task> taskList) {
+        this.taskList = taskList;
+    }
+
+    public int getSize() {
+        return this.taskList.size();
+    }
+
+    public String displayNumTasks() {
+
+        String text = "You now have " + taskList.size() +
+                " task(s) left in the list.";
+        return text;
+    }
+
+    public void addTask(Task task) {
+        this.taskList.add(task);
+    }
+
+    public void markTask(int index) {
+        this.taskList.get(index).setDone(true);
+    }
+
+    public void unmarkTask(int index) {
+        this.taskList.get(index).setDone(false);
+    }
+
+    public Task deleteTask(int index) {
+        return this.taskList.remove(index);
+    }
+
+    public String taskListString() {
+
+        String text = "";
+
+        if (this.taskList.size() == 0) {
+
+            return "You currently have no task in the list";
+        } else {
+
+            text += "Here are the tasks currently stored in your list:\n";
+
+            for (int i = 0; i < this.taskList.size(); i++) {
+
+                text +=  (i + 1) + ". " +
+                        this.taskList.get(i).toString();
+                if (i != this.taskList.size() - 1) {
+                    text += "\n";
+                }
+            }
+        }
+        return text;
+    }
+
+    public String taskListFileString() {
+
+        String text = "";
+        for (Task task : this.taskList) {
+            text += task.fileString() + "\n";
+        }
+        return text;
+    }
+
+    public String getTaskString(int index) {
+        return this.taskList.get(index).toString();
+    }
+
+    public ArrayList<Task> findTasks(String word) {
+        ArrayList searchMatchList = new ArrayList<Task>();
+        for(Task task : taskList) {
+            if (task.getDescription().contains(word)) {
+                searchMatchList.add(task);
+            }
+        }
+        return searchMatchList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/duke/tasks/ToDo.java b/src/main/java/duke/tasks/ToDo.java
new file mode 100644
index 0000000000..f84f4b1d24
--- /dev/null
+++ b/src/main/java/duke/tasks/ToDo.java
@@ -0,0 +1,28 @@
+package duke.tasks;
+
+/**
+ * Represents a ToDo task
+ */
+public class ToDo extends Task {
+
+    public ToDo(String description) {
+        super(description);
+    }
+
+    public ToDo(String description, boolean isDone) {
+
+        super(description, isDone);
+    }
+
+    @Override
+    public String fileString() {
+
+        return "T" + super.fileString();
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+
+}
diff --git a/src/main/java/duke/ui/DialogBox.java b/src/main/java/duke/ui/DialogBox.java
new file mode 100644
index 0000000000..bd639e3a27
--- /dev/null
+++ b/src/main/java/duke/ui/DialogBox.java
@@ -0,0 +1,61 @@
+package duke.ui;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.image.Image;
+
+import java.io.IOException;
+import java.util.Collections;
+
+//@author:{garfield-oo7}
+// {reused code with slight modifications from @kxrt}
+
+public class DialogBox extends HBox {
+
+    @FXML
+    private Label dialog;
+    @FXML
+    private ImageView displayPicture;
+
+    private DialogBox(String text, Image img) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
+            fxmlLoader.setController(this);
+            fxmlLoader.setRoot(this);
+            fxmlLoader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        dialog.setText(text);
+        displayPicture.setImage(img);
+        displayPicture.setFitHeight(55);
+    }
+
+
+    /**
+     * Flips the dialog box such that the ImageView is on the left and text on the right.
+     */
+    private void flip() {
+        ObservableList<Node> tmp = FXCollections.observableArrayList(this.getChildren());
+        Collections.reverse(tmp);
+        getChildren().setAll(tmp);
+        setAlignment(Pos.TOP_LEFT);
+    }
+
+    public static DialogBox getUserDialog(String text, Image img) {
+        return new DialogBox(text, img);
+    }
+
+    public static DialogBox getDukeDialog(String text, Image img) {
+        var db = new DialogBox(text, img);
+        db.flip();
+        return db;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/duke/ui/Main.java b/src/main/java/duke/ui/Main.java
new file mode 100644
index 0000000000..35d384b79a
--- /dev/null
+++ b/src/main/java/duke/ui/Main.java
@@ -0,0 +1,32 @@
+package duke.ui;
+
+import java.io.IOException;
+
+import duke.Duke;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+/**
+ * A GUI for Duke using FXML.
+ */
+public class Main extends Application {
+
+    private Duke duke = new Duke();
+
+    @Override
+    public void start(Stage stage) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
+            AnchorPane ap = fxmlLoader.load();
+            Scene scene = new Scene(ap);
+            stage.setScene(scene);
+            fxmlLoader.<MainWindow>getController().setDuke(duke);
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/duke/ui/MainWindow.java b/src/main/java/duke/ui/MainWindow.java
new file mode 100644
index 0000000000..e93ba9015a
--- /dev/null
+++ b/src/main/java/duke/ui/MainWindow.java
@@ -0,0 +1,77 @@
+package duke.ui;
+
+import duke.Duke;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.VBox;
+import javafx.animation.PauseTransition;
+import javafx.util.Duration;
+import javafx.application.Platform;
+
+/**
+ * Controller for MainWindow. Provides the layout for the other controls.
+ */
+
+//@author:{garfield-oo7}
+// {reused code with slight modifications from @kxrt}
+public class MainWindow extends AnchorPane {
+
+    private final String WELCOME = "Hello I'm Duke" + "!!\n" +
+            "What can I do for you?\n For the list of all commands please " +
+            "type \"help\"";
+    @FXML
+    private ScrollPane scrollPane;
+    @FXML
+    private VBox dialogContainer;
+    @FXML
+    private TextField userInput;
+    @FXML
+    private Button sendButton;
+
+    private Duke duke;
+
+    private Image userImage = new Image(this.getClass().getResourceAsStream("/images/user.png"));
+    private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/chatbot.png"));
+
+    @FXML
+    public void initialize() {
+        scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
+        dialogContainer.getChildren().addAll(
+                DialogBox.getDukeDialog(WELCOME , dukeImage));
+    }
+
+    public void setDuke(Duke d) {
+        duke = d;
+    }
+
+
+    /**
+     * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to
+     * the dialog container. Clears the user input after processing.
+     */
+    @FXML
+    private void handleUserInput() {
+        String input = userInput.getText();
+
+        // ignore empty user inputs.
+        if (input.trim().equals("")){
+            return;
+        }
+
+        String response = duke.getResponse(input);
+        dialogContainer.getChildren().addAll(
+                DialogBox.getUserDialog(input, userImage),
+                DialogBox.getDukeDialog(response, dukeImage)
+        );
+        if (input.toLowerCase().trim().equals("bye")) {
+            PauseTransition delay = new PauseTransition(Duration.seconds(2));
+            delay.setOnFinished(event -> Platform.exit());
+            delay.play();
+        }
+        userInput.clear();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java
new file mode 100644
index 0000000000..cc47c1e322
--- /dev/null
+++ b/src/main/java/duke/ui/Ui.java
@@ -0,0 +1,31 @@
+package duke.ui;
+
+import java.util.Scanner;
+
+public class Ui {
+
+    private final String LINE = "------------------------------" +
+            "--------------------";
+    private final String WELCOME = "Hello I'm Duke" + "!!\n" +
+            "What do you wanna chat about today?";
+    private final String EXIT = "Bye. Looking forward to chating " +
+            "with you soon again!";
+
+    private final Scanner sc;
+
+    public Ui() {
+        this.sc = new Scanner(System.in);
+    }
+
+    public String displayMessage(String message) {
+        String text = "";
+        text += message + "\n";
+        return text;
+    }
+
+    public String displayExitMessage() {
+        sc.close();
+        return EXIT;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/resources/images/chatbot.png b/src/main/resources/images/chatbot.png
new file mode 100644
index 0000000000..206a4ead50
Binary files /dev/null and b/src/main/resources/images/chatbot.png differ
diff --git a/src/main/resources/images/user.png b/src/main/resources/images/user.png
new file mode 100644
index 0000000000..e00ee6d194
Binary files /dev/null and b/src/main/resources/images/user.png differ
diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
new file mode 100644
index 0000000000..ea9af924e5
--- /dev/null
+++ b/src/main/resources/view/DialogBox.fxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.text.Font?>
+
+<fx:root alignment="CENTER_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+         style="-fx-background-color: black; -fx-border-color: black;" type="javafx.scene.layout.HBox"
+         xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Label fx:id="dialog" maxHeight="1.7976931348623157E308" minHeight="-Infinity"
+               style="-fx-padding: 10px; -fx-background-color: black;"
+               text="Label" textFill="#00bfff" wrapText="true" HBox.hgrow="ALWAYS">
+            <font>
+                <Font name="Comic Sans MS" size="13.0" />
+            </font>
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Label>
+        <ImageView fx:id="displayPicture" fitHeight="99.0" fitWidth="99.0" pickOnBounds="true" preserveRatio="true" />
+    </children>
+    <padding>
+        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+    </padding>
+</fx:root>
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
new file mode 100644
index 0000000000..5c16654444
--- /dev/null
+++ b/src/main/resources/view/MainWindow.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+            minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0"
+            xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="duke.ui.MainWindow">
+    <children>
+        <TextField fx:id="userInput" layoutX="2.0"  layoutY="554.0" onAction="#handleUserInput"
+                   prefHeight="42.0" prefWidth="324.0" promptText="Enter Command here..."
+                   style="-fx-border-color: black; -fx-border-width: 2px; -fx-padding: 0px;"
+                   AnchorPane.bottomAnchor="4.0" AnchorPane.leftAnchor="2.0"
+                   AnchorPane.rightAnchor="76.0">
+            <font>
+                <Font name="Comic Sans MS" size="13.0"/>
+            </font>
+            <opaqueInsets>
+                <Insets/>
+            </opaqueInsets>
+        </TextField>
+        <Button fx:id="sendButton" layoutX="327.0" layoutY="554.0" mnemonicParsing="false"
+                onAction="#handleUserInput" prefHeight="41.0" prefWidth="71.0" text="Enter"
+                style="-fx-background-color: black; -fx-padding: 0px; -fx-background-radius: 0px;"
+                AnchorPane.rightAnchor="2.0" AnchorPane.bottomAnchor="5.0" textFill="#00bfff">
+                <font>
+                    <Font name="Comic Sans MS Bold"   size="16.0" />
+                </font>
+        </Button>
+        <ScrollPane fx:id="scrollPane" fitToWidth="true"  fitToHeight="true" hbarPolicy="NEVER"
+                    hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0" AnchorPane.topAnchor="0.0"
+                    AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+                    AnchorPane.bottomAnchor="50.0" style="-fx-background-color: black;">
+            <content>
+                <VBox fx:id="dialogContainer" prefHeight="552.0" prefWidth="388.0"
+                      style="-fx-background-color: black;"/>
+            </content>
+        </ScrollPane>
+    </children>
+</AnchorPane>
\ No newline at end of file
diff --git a/src/test/java/duke/TaskListTest.java b/src/test/java/duke/TaskListTest.java
new file mode 100644
index 0000000000..bd6b36cdf6
--- /dev/null
+++ b/src/test/java/duke/TaskListTest.java
@@ -0,0 +1,25 @@
+package duke;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+
+public class TaskListTest {
+
+    @Test
+    public void printTaskList_nonEmptyList() {
+        TaskList t = new TaskList(new ArrayList<Task>());
+        t.addTask(new ToDo("Hello world"));
+        assertEquals("Here are the task(s) in your list:\n" + "  1. [T][ ] Hello world",
+                t.taskListString());
+    }
+
+    @Test
+    public void printTaskList_emptyList() {
+        TaskList t = new TaskList(new ArrayList<Task>());
+        assertEquals("You currently have no tasks",
+                t.taskListString());
+    }
+
+
+}
\ No newline at end of file
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e7..0a36981473 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,66 @@
-Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
+----------------------------------------------------------------
+	 Hello I'm duke!!
+What do you wanna chat about today?
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Got it. I just added the task:
+		[T][ ]  read book
+	Now you have 1 tasks in the list
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Got it. I just added the task:
+		[E][ ]  project meeting  (at: Mon 2-4pm)
+	Now you have 3 tasks in the list
+----------------------------------------------------------------
+----------------------------------------------------------------
+	1. [T][ ]  read book
+	2. [D][ ]  return book  (by: Sunday)
+	3. [E][ ]  project meeting  (at: Mon 2-4pm)
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Excellent! I have marked the task as done:
+	[T][X]  read book
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Excellent! I have marked the task as done:
+	[D][X]  return book  (by: Sunday)
+----------------------------------------------------------------
+----------------------------------------------------------------
+	1. [T][X]  read book
+	2. [D][X]  return book  (by: Sunday)
+	3. [E][ ]  project meeting  (at: Mon 2-4pm)
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Noted! I have marked the task as not done yet:
+	[T][ ]  read book
+----------------------------------------------------------------
+----------------------------------------------------------------
+	1. [T][ ]  read book
+	2. [D][X]  return book  (by: Sunday)
+	3. [E][ ]  project meeting  (at: Mon 2-4pm)
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Got it. I just added the task:
+		[T][ ]  join sports club
+	Now you have 4 tasks in the list
+----------------------------------------------------------------
+----------------------------------------------------------------
+	1. [T][ ]  read book
+	2. [D][X]  return book  (by: Sunday)
+	3. [E][ ]  project meeting  (at: Mon 2-4pm)
+	4. [T][ ]  join sports club
+----------------------------------------------------------------
+----------------------------------------------------------------
+	Noted. I've remove this task:[D][X]  return book  (by: Sunday)
+	 Now you have 3 tasks in the list.
+----------------------------------------------------------------
+list
+----------------------------------------------------------------
+	1. [T][ ]  read book
+	2. [E][ ]  project meeting  (at: Mon 2-4pm)
+	3. [T][ ]  join sports club
+----------------------------------------------------------------
+----------------------------------------------------------------
+	 Bye. Looking forward to chating with you soon again!
+----------------------------------------------------------------
 
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb2..24a6ecf028 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,14 @@
+todo read book
+deadline return book /by Sunday
+event project meeting /at Mon 2-4pm
+list
+mark 1
+mark 2
+list
+unmark 1
+list
+todo join sports club
+list
+delete 2
+list
+bye
\ No newline at end of file