diff --git a/.gitignore b/.gitignore
index f69985ef1..af6bf95f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ bin/
 
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
+duke.txt
diff --git a/README.md b/README.md
index 8715d4d91..ab7d58d49 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,10 @@
+# Duke
+
+* Duke helps you record your tasks and manage them.  
+* It is a CLI program, where you type in commands to the program.  
+* If you forget or are unsure about Duke's functions, enter **help** to learn how to use them.  
+
+## Functionalities
 # Duke project template
 
 This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
@@ -13,7 +20,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    1. If there are any further prompts, accept the defaults.
 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
    In the same dialog, set the **Project language level** field to the `SDK default` option.
-3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
+3. After that, locate the `src/main/java/duke/Duke.java` file, right-click it, and choose `Run duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
    ```
    Hello from
     ____        _        
@@ -21,4 +28,4 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    | | | | | | | |/ / _ \
    | |_| | |_| |   <  __/
    |____/ \__,_|_|\_\___|
-   ```
+   ```
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 8077118eb..af1226cfe 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,28 +2,256 @@
 
 ## Features 
 
-### Feature-ABC
+### Add Task
 
-Description of the feature.
+Allows you to add different kinds of tasks such as ToDos, Deadlines and Events
+* ToDo - A task that can be done anytime
+* Deadline - A task that needs to be done before a certain time
+* Events - A task that needs to be done at a certain period of time
 
-### Feature-XYZ
+### List
 
-Description of the feature.
+Shows you the list of tasks you have and their status of completion.
+
+### Find
+
+Allows you to find tasks with a specific description or date.
+
+### Done
+
+Allows you to mark a task as done
+
+### Delete
+
+Allows you to remove a task from the list
+
+### Load
+
+Loads tasks from the "duke.txt" file if it exists. Creates a new "duke.txt" file if it does not
+
+### Save
+
+Saves the tasks to the "duke.txt" file when the program is terminated
 
 ## Usage
 
-### `Keyword` - Describe action
+### `todo` - todo *description* 
+
+* Adds a ToDo task with its description to the list. 
+* If successful, the system will print out a success message, the task added, and the number of tasks in the list
+
+Example of usage: 
+
+`todo read book`
+
+Expected outcome:
+
+* The success message is shown, along with the description of the task, the type of task added and the number of tasks in the list.
+
+```
+      ___________________________________________________________
+      I've added this to your list :D
+      [T][ ] read book
+      Now you have 1 task(s) in the list
+      ___________________________________________________________
+```
+
+### `deadline` - deadline *description* /by *date*
+
+* Adds a Deadline task with its description and the date and time of the deadline to the list. 
+* If successful, the system will print out a success message, the task added, and the number of tasks in the list. 
+* The date of deadline is in the format of *yyyy-MM-ddTHH:mm* , where *yyyy* is the year, *MM* is the month, *dd* is the day, *HH* is the hour and *mm* is the minute.
+
+Example of usage: 
+
+`deadline finish homework /by 2021-09-30T23:00`
+
+Expected outcome:
+
+* The success message is shown, along with the description of the task, date and time of the deadline, the type of task added, and the number of tasks in the list.
+
+```
+      ___________________________________________________________
+      I've added this to your list :D
+      [D][ ] finish homework (by: Sep 30 2021 23:00)
+      Now you have 2 task(s) in the list
+      ___________________________________________________________
+```
+
+
+### `event` - event *description* /at *start time* /to *end time*
+
+* Adds an Event task with its description and the date and time of the event to the list. 
+* If successful, the system will return a success message, the task added, and the number of tasks in the list. 
+* The date and time of the start of the event should be added before */to* and the date and time of the end of the event should be added after */to*
+* The date of deadline is in the format of *yyyy-MM-ddTHH:mm* , where *yyyy* is the year, *MM* is the month, *dd* is the day, *HH* is the hour and *mm* is the minute.
+
+Example of usage: 
+
+`event celebrate birthday /at 2021-09-30T00:00 /to 2021-09-30T02:00`
+
+Expected outcome:
+
+* The success message is shown, along with the description of the task, date and time of the event, the type of task added, and the number of tasks in the list.
+
+```
+      ___________________________________________________________
+      I've added this to your list :D
+      [E][ ] celebrate birthday (at: Sep 30 2021 00:00 to Sep 30 02:00)
+      Now you have 3 task(s) in the list
+      ___________________________________________________________
+```
+
+### `list` - list
+
+* Displays the list of all tasks and their status of completion.
+
+Example of usage: 
+
+`list`
+
+Expected outcome:
+
+* The list of tasks with their status of completion.
+* If **X** appears in the second box, it means the task is completed.
+* If the second box is empty, it means the task is not completed.
+
+```
+      ___________________________________________________________
+      Here are the things you need to do :
+      1.[T][ ] read book
+      2.[D][ ] finish homework (by: Sep 30 2021 23:00)
+      3.[E][ ] celebrate birthday (at: Sep 30 2021 00:00 to Sep 30 02:00)
+      ___________________________________________________________
+```
+
+### `find` - find *keyword* **or** find /d *date*
+
+* Searches through the list for tasks containing the keyword or with the same date, then displays all such tasks to the user if there is any.
+* The date should be typed in the format of *yyyy-MM-dd* , where *yyyy* is the year, *MM* is the month and *dd* is the day
+
+Example of usage: 
+
+1. `find read`
+2. `find /d 2021-09-30`
+
+Expected outcome:
+
+1. A list of tasks containing the keyword given is shown to the user
+2. A list of tasks with the same date is shown to the user
+
+```
+      ___________________________________________________________
+      Here are the matching tasks in your list : 
+      1.[T][ ] read book
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Here are the matching tasks in your list : 
+      1.[D][ ] finish homework (by: Sep 30 2021 23:00)
+      2.[E][ ] celebrate birthday (at: Sep 30 2021 00:00 to Sep 30 02:00)
+      ___________________________________________________________
+```
+
+### `done` - done *integer*
+
+* Marks the task with the specific number on the list as done.
+* If successful, the system will print out the task marked as done and the task will have an **X** in the second box.
+
+Example of usage: 
+
+`done 1`
+
+Expected outcome:
+
+* The first task in the list is marked as done.
+
+```
+      ___________________________________________________________
+      You've completed the task! Well done!
+      [T][X] read book
+      ___________________________________________________________
+```
+
+### `delete` - delete *integer*
+
+* Deletes the task with the specific number on the list.
+* If successful, the system will print out a success message, the deleted task, and the number of remaining tasks.
+
+Example of usage: 
+
+`delete 1`
+
+Expected outcome:
+
+* The first task is deleted. The deleted task and the number of remaining tasks are shown.
+
+```
+      ___________________________________________________________
+      Alright, I've removed this task:
+      [T][X] read book
+      Now you have 2 task(s) in the list 
+      ___________________________________________________________
+```
+
+### `help` - help
+
+* Asks Duke to show the list of commands.
+
+Example of usage: 
+
+`help`
+
+Expected outcome:
+* The list of all the commands is printed out.
+
+```
+      ___________________________________________________________
+      list
+      - Shows you the list of tasks you have
+
+      todo (description)
+      - Saves a general todo task
+
+      deadline (description) /by yyyy-MM-ddTHH:mm
+      - Saves a task with a given deadline
+      - yyyy is the year, MM is the month, dd is the day, HH is the hour,
+        and mm is the minute 
+
+      event (description) /at yyyy-MM-ddTHH:mm /to yyyy-MM-ddTHH:mm
+      - Saves an event happening at a certain time period
+      - yyyy is the year, MM is the month, dd is the day, HH is the hour,
+        and mm is the minute 
+
+      delete (integer)
+      - Deletes a task with the corresponding number on the list
+
+      done (integer)
+      - Marks the task with the corresponding number as done
+
+      find (keyword)
+      - Finds tasks that contains the String given
+
+      find /d yyyy-MM-dd
+      - Finds tasks with the same date as the date given
+      - yyyy is the year, MM is the month and dd is the day
+      ___________________________________________________________
+```
+
+### `bye` - bye
 
-Describe the action and its outcome.
+* Terminates the program and saves the tasks to the file "duke.txt".
 
 Example of usage: 
 
-`keyword (optional arguments)`
+`bye`
 
 Expected outcome:
 
-Description of the outcome.
+* The exit message is printed.
 
 ```
-expected output
+      ___________________________________________________________
+      Bye, hope to see you again soon! :)
+      ___________________________________________________________
 ```
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
deleted file mode 100644
index 5d313334c..000000000
--- 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/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..2c9a9745c
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: duke.Duke
+
diff --git a/src/main/java/commands/AddCommand.java b/src/main/java/commands/AddCommand.java
new file mode 100644
index 000000000..0d6914d6d
--- /dev/null
+++ b/src/main/java/commands/AddCommand.java
@@ -0,0 +1,105 @@
+package commands;
+
+import static constants.Message.INDENTATION;
+import duke.DefaultException;
+import task.Task;
+import task.Event;
+import task.Deadline;
+import task.ToDo;
+import task.TaskType;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeParseException;
+
+/**
+ * A Command class that contains methods for adding tasks to the ArrayList.
+ */
+public class AddCommand extends Command{
+
+    private static final int EXPECTED_LENGTH_FOR_DEADLINE = 2;
+    private static final int EXPECTED_LENGTH_FOR_EVENT = 3;
+    public static final String DEADLINE_FORMAT_ERROR = "Please type the deadline in the format : \n" +
+            INDENTATION + "'deadline (description) /by yyyy-MM-ddThh:mm' :)";
+    public static final String EVENT_FORMAT_ERROR = "Please type the event in the format: \n" +
+            INDENTATION + "'event (description) /at yyyy-MM-ddThh:mm /to yyyy-MM-ddThh:mm' :)";
+    private static final String DATE_TIME_FORMAT_ERROR_FOR_DEADLINE = "Please write the date and time in the" +
+            " format : 'yyyy-mm-ddThh:mm'  :)";
+    private static final String DATE_TIME_FORMAT_ERROR_FOR_EVENT = "Please write the date and time in the format : \n"
+            + INDENTATION + "'yyyy-mm-ddThh:mm /to yyy-mm-ddThh:mm'  :)";
+    public static final String ADDED_TO_LIST = "I've added this to your list :D";
+    public static final String TODO_COMMAND = "todo";
+    public static final String EVENT_COMMAND = "event";
+    public static final String DEADLINE_COMMAND = "deadline";
+
+    private final String[] parsedOutputs;
+    private final TaskType type;
+
+    public AddCommand(String[] parsedOutputs, TaskType type) {
+        this.parsedOutputs = parsedOutputs;
+        this.type = type;
+    }
+
+    /**
+     * Creates a task object and adds it to the ArrayList depending on the type of task.
+     *
+     * @return A CommandResult that tells the Ui to print the status of the execution
+     * and the task added (if successful).
+     * @throws DefaultException Throws an exception if something unexpected happens.
+     */
+    @Override
+    public CommandResult execute() throws  DefaultException {
+        switch(type){
+        case TODO:
+            tasks.addTask(new ToDo(parsedOutputs[0]));
+            return new CommandResult(ADDED_TO_LIST,tasks.getTask(Task.getTotalTasks()-1),
+                    PrintOptions.WITH_TASK_AND_NUMBER_OF_TASK);
+        case EVENT:
+            return getCommandResultForEvent();
+        case DEADLINE:
+            return getCommandResultForDeadline();
+        default :
+            throw new DefaultException();
+        }
+    }
+
+    /**
+     * Tries to add a deadline to the ArrayList.
+     *
+     * @return A CommandResult that tells the Ui to print the status of the execution
+     * and the task added (if successful).
+     */
+    private CommandResult getCommandResultForDeadline() {
+        if(parsedOutputs.length < EXPECTED_LENGTH_FOR_DEADLINE) {
+            return new CommandResult(DEADLINE_FORMAT_ERROR,PrintOptions.DEFAULT);
+        }
+        try {
+            tasks.addTask(new Deadline(parsedOutputs[0], LocalDateTime.parse(parsedOutputs[1])));
+            return new CommandResult(ADDED_TO_LIST,tasks.getTask(Task.getTotalTasks()-1),
+                    PrintOptions.WITH_TASK_AND_NUMBER_OF_TASK);
+        } catch (DateTimeParseException error) {
+            return new CommandResult(DATE_TIME_FORMAT_ERROR_FOR_DEADLINE,PrintOptions.DEFAULT);
+        }
+    }
+
+    /**
+     * Tries to add an event to the ArrayList.
+     *
+     * @return A CommandResult that tells the Ui to print the status of the execution
+     * and the task added (if successful).
+     */
+    private CommandResult getCommandResultForEvent() {
+        if(parsedOutputs.length < EXPECTED_LENGTH_FOR_EVENT) {
+            return new CommandResult(EVENT_FORMAT_ERROR,PrintOptions.DEFAULT);
+        }
+        try {
+            tasks.addTask(new Event(parsedOutputs[0], LocalDateTime.parse(parsedOutputs[1]),
+                    LocalDateTime.parse(parsedOutputs[2])));
+            return new CommandResult(ADDED_TO_LIST,tasks.getTask(Task.getTotalTasks()-1),
+                    PrintOptions.WITH_TASK_AND_NUMBER_OF_TASK);
+        } catch (DateTimeParseException error) {
+            return new CommandResult(DATE_TIME_FORMAT_ERROR_FOR_EVENT,PrintOptions.DEFAULT);
+        }
+    }
+
+
+}
diff --git a/src/main/java/commands/Command.java b/src/main/java/commands/Command.java
new file mode 100644
index 000000000..c3528c73c
--- /dev/null
+++ b/src/main/java/commands/Command.java
@@ -0,0 +1,21 @@
+package commands;
+
+import duke.DefaultException;
+import duke.DukeException;
+import tasklist.TaskList;
+
+
+/**
+ * An abstract class with the common methods and attributes for different types of Commands.
+ */
+public abstract class Command {
+    protected TaskList tasks;
+
+    public Command() {
+        this.tasks = new TaskList();
+    }
+    public abstract CommandResult execute() throws DukeException, DefaultException;
+    public void passTaskList(TaskList tasks) {
+        this.tasks = tasks;
+    }
+}
diff --git a/src/main/java/commands/CommandResult.java b/src/main/java/commands/CommandResult.java
new file mode 100644
index 000000000..db4a4dfb2
--- /dev/null
+++ b/src/main/java/commands/CommandResult.java
@@ -0,0 +1,56 @@
+package commands;
+
+import task.Task;
+import tasklist.TaskList;
+
+/**
+ * A class for passing the message from the execution of the Command to the Ui.
+ */
+public class CommandResult{
+    public final String message;
+    public final Task task;
+    public final TaskList tasks;
+    public final PrintOptions type;
+
+    /**
+     * Creates a CommandResult that allows the list of tasks to be shown to the user
+     *
+     * @param message Message to the user
+     * @param tasks The list of tasks
+     * @param type The options for printing in Ui.showResult
+     */
+    public CommandResult(String message, TaskList tasks, PrintOptions type) {
+        this.message = message;
+        this.task = null;
+        this.tasks = tasks;
+        this.type = type;
+    }
+
+    /**
+     * Creates a CommandResult that only needs to show a message to the user.
+     *
+     * @param message Message to the user
+     * @param type The options for printing in Ui.showResult
+     */
+    public CommandResult(String message, PrintOptions type) {
+        this.message = message;
+        this.task = null;
+        this.tasks = null;
+        this.type = type;
+    }
+
+    /**
+     * Creates a CommandResult that requires a deleted/added task to be shown to the user.
+     *
+     * @param message Message to the user
+     * @param task The task shown to the user
+     * @param type The options for printing in Ui.showResult
+     */
+    public CommandResult(String message, Task task, PrintOptions type) {
+        this.message = message;
+        this.task = task;
+        this.tasks = null;
+        this.type = type;
+    }
+
+}
diff --git a/src/main/java/commands/DeleteCommand.java b/src/main/java/commands/DeleteCommand.java
new file mode 100644
index 000000000..be8751171
--- /dev/null
+++ b/src/main/java/commands/DeleteCommand.java
@@ -0,0 +1,31 @@
+package commands;
+
+import task.Task;
+
+/**
+ * A Command class that deletes a task in the ArrayList.
+ */
+public class DeleteCommand extends Command{
+
+    public static final String DELETE_COMMAND = "delete";
+    public static final String TASK_REMOVED = "Alright, I've removed this task:";
+    private final int index;
+
+    public DeleteCommand(int index) {
+        this.index = index;
+    }
+
+    /**
+     * Deletes a task with a given index on the ArrayList
+     *
+     * @return A CommandResult that tells the Ui to print the status of execution
+     * and the deleted task.
+     * @throws NumberFormatException Throws an exception if the input given is not a number.
+     */
+    @Override
+    public CommandResult execute() throws IndexOutOfBoundsException {
+        Task temp = tasks.getTask(index);
+        tasks.deleteTask(index);
+        return new CommandResult(TASK_REMOVED,temp,PrintOptions.WITH_TASK_AND_NUMBER_OF_TASK);
+    }
+}
diff --git a/src/main/java/commands/DoneCommand.java b/src/main/java/commands/DoneCommand.java
new file mode 100644
index 000000000..f666673f4
--- /dev/null
+++ b/src/main/java/commands/DoneCommand.java
@@ -0,0 +1,29 @@
+package commands;
+
+/**
+ * A Command class that marks a task in the ArrayList as done
+ */
+public class DoneCommand extends Command{
+
+    private final int index;
+    private static final String TASK_COMPLETED_MESSAGE = "You've completed the task! Well done!";
+    public static final String DONE_COMMAND = "done";
+
+    public DoneCommand(int index) {
+        this.index = index;
+    }
+
+    /**
+     * Marks a task of a given index in the ArrayList as done
+     *
+     * @return A CommandResult that that tells the Ui to print the status of execution
+     * and the task that is done.
+     * @throws IndexOutOfBoundsException Throws an exception if the input given is not a number.
+     */
+    @Override
+
+    public CommandResult execute() throws IndexOutOfBoundsException {
+        tasks.getTask(index).markAsDone();
+        return new CommandResult(TASK_COMPLETED_MESSAGE,tasks.getTask(index),PrintOptions.ONLY_TASK);
+    }
+}
diff --git a/src/main/java/commands/ExitCommand.java b/src/main/java/commands/ExitCommand.java
new file mode 100644
index 000000000..69a342c41
--- /dev/null
+++ b/src/main/java/commands/ExitCommand.java
@@ -0,0 +1,20 @@
+package commands;
+
+/**
+ * A Command class that passes the exit message to the Ui
+ */
+public class ExitCommand extends Command{
+
+    public static final String GOODBYE_MESSAGE = "Bye, hope to see you again soon! :)";
+    public static final String EXIT_COMMAND = "bye";
+
+    /**
+     * Sends the exit message to the Ui
+     *
+     * @return A CommandResult that tells the Ui to print the exit message.
+     */
+    @Override
+    public CommandResult execute() {
+        return new CommandResult(GOODBYE_MESSAGE,PrintOptions.DEFAULT);
+    }
+}
diff --git a/src/main/java/commands/FindCommand.java b/src/main/java/commands/FindCommand.java
new file mode 100644
index 000000000..4aab2f56d
--- /dev/null
+++ b/src/main/java/commands/FindCommand.java
@@ -0,0 +1,110 @@
+package commands;
+
+import task.Deadline;
+import task.Event;
+import task.Task;
+import tasklist.TaskList;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * A Command class that contains methods for finding tasks with specific description or date.
+ */
+public class FindCommand extends Command{
+
+    private final String input;
+    private final LocalDate dateTime;
+    private static final String LIST_CONTAINING_STRING_MESSAGE = "Here are the matching tasks in your list : ";
+    private static final String LIST_OF_SPECIFIC_DATE = "Here are the things you need to do on that day :";
+    private static final String NO_SIMILAR_WORDS = "There are no matching tasks :(";
+    public static final String FIND_COMMAND = "find";
+
+    public FindCommand(String input) {
+        this.input = input;
+        this.dateTime = null;
+    }
+    public FindCommand(LocalDate dateTime) {
+        this.input = null;
+        this.dateTime = dateTime;
+    }
+
+    /**
+     * Searches through the ArrayList for tasks which contains the descriptions
+     * given or have the same date.
+     *
+     * @return A CommandResult that tells the Ui to print the status of the execution
+     * and the list of tasks with similar descriptions / dates (if successful).
+     */
+    public CommandResult execute() {
+        int totalTasks;
+        String message;
+        TaskList taskContainingInput = new TaskList();
+        if(input == null) {
+            totalTasks = getTasksOfSpecificDate(taskContainingInput);
+            message = LIST_OF_SPECIFIC_DATE;
+        } else {
+            totalTasks = getTasksOfSpecificString(taskContainingInput);
+            message = LIST_CONTAINING_STRING_MESSAGE;
+        }
+        taskContainingInput.setNumberOfTask(totalTasks);
+        if(totalTasks == 0) {
+            return new CommandResult(NO_SIMILAR_WORDS,PrintOptions.DEFAULT);
+        }
+        return new CommandResult(message,
+                taskContainingInput,PrintOptions.LIST_WITH_SPECIFIC_CONDITIONS);
+    }
+
+    /**
+     * Iterates through the ArrayList to get tasks with specific descriptions
+     *
+     * @param taskContainingString The new TaskList created for adding tasks
+     *                             with specific descriptions
+     * @return The total number of tasks in the new TaskList
+     */
+    private int getTasksOfSpecificString(TaskList taskContainingString) {
+        int totalTasks = 0;
+        for (int i = 0; i < Task.getTotalTasks(); i++) {
+            if(tasks.getTask(i).getDescription().contains(input)){
+                taskContainingString.addTaskForFindCommand(tasks.getTask(i));
+                totalTasks++;
+            }
+        }
+        return totalTasks;
+    }
+
+    /**
+     * Iterates through the ArrayList to get tasks with a specific date
+     *
+     * @param tasksOfSpecificDate The new TaskList created for adding tasks
+     *                             with a specific date
+     * @return The total number of tasks in the new TaskList
+     */
+    private int getTasksOfSpecificDate(TaskList tasksOfSpecificDate) {
+        int totalTasks = 0;
+        for (int i = 0; i <Task.getTotalTasks(); i++) {
+            Task temp = tasks.getTask(i);
+            if (taskWithSameDate(temp) != null) {
+                tasksOfSpecificDate.addTaskForFindCommand(taskWithSameDate(temp));
+                totalTasks++;
+            }
+        }
+        return totalTasks;
+    }
+
+    private Task taskWithSameDate(Task temp) {
+        if(temp instanceof Event && sameDate(((Event) temp).getFromDateAndTime())) {
+            return temp;
+        } else if(temp instanceof Deadline && sameDate(((Deadline) temp).getDateAndTime())){
+            return temp;
+        } else {
+            return null;
+        }
+    }
+
+    private Boolean sameDate (LocalDateTime date) {
+        Boolean isSameYear = date.getYear() == dateTime.getYear();
+        Boolean isSameDayOfYear = date.getDayOfYear() == dateTime.getDayOfYear();
+        return (isSameYear && isSameDayOfYear);
+    }
+}
diff --git a/src/main/java/commands/HelpCommand.java b/src/main/java/commands/HelpCommand.java
new file mode 100644
index 000000000..7a187fee9
--- /dev/null
+++ b/src/main/java/commands/HelpCommand.java
@@ -0,0 +1,41 @@
+package commands;
+
+import static constants.Message.INDENTATION;
+
+/**
+ * A Command class that send the help message to the Ui
+ */
+public class HelpCommand extends Command{
+
+    public static final String HELP_COMMAND = "help";
+    private static final String HELP_MESSAGE = "list\n" +INDENTATION +
+            "- Shows you the list of tasks you have\n\n" +INDENTATION +
+            "todo (description)\n" + INDENTATION +
+            "- Saves a general todo task\n\n" + INDENTATION +
+            "deadline (description) /by yyyy-MM-ddTHH:mm\n" + INDENTATION +
+            "- Saves a task with a given deadline\n" + INDENTATION +
+            "- yyyy is the year, MM is the month, dd is the day, HH is the hour,\n" +INDENTATION +
+            "  and mm is the minute \n\n" + INDENTATION +
+            "event (description) /at yyyy-MM-ddTHH:mm /to yyyy-MM-ddTHH:mm\n" + INDENTATION +
+            "- Saves an event happening at a certain time period\n" + INDENTATION +
+            "- yyyy is the year, MM is the month, dd is the day, HH is the hour,\n" +INDENTATION+
+            "  and mm is the minute \n\n" + INDENTATION +
+            "delete (integer)\n" + INDENTATION +
+            "- Deletes a task with the corresponding number on the list\n\n" + INDENTATION +
+            "done (integer)\n" + INDENTATION +
+            "- Marks the task with the corresponding number as done\n\n" + INDENTATION +
+            "find (keyword)\n" + INDENTATION +
+            "- Finds tasks that contains the String given\n\n" + INDENTATION +
+            "find /d yyyy-MM-dd\n" + INDENTATION +
+            "- Finds tasks with the same date as the date given\n" + INDENTATION +
+            "- yyyy is the year, MM is the month and dd is the day";
+
+    /**
+     * Sends the help message to the Ui
+     * @return A CommandResult that tells the Ui to print the help message.
+     */
+    @Override
+    public CommandResult execute() {
+        return new CommandResult(HELP_MESSAGE,PrintOptions.DEFAULT);
+    }
+}
diff --git a/src/main/java/commands/IncorrectCommand.java b/src/main/java/commands/IncorrectCommand.java
new file mode 100644
index 000000000..7f13035d8
--- /dev/null
+++ b/src/main/java/commands/IncorrectCommand.java
@@ -0,0 +1,23 @@
+package commands;
+
+/**
+ * A Command Class that send an error message to the Ui
+ */
+public class IncorrectCommand extends Command{
+
+    private final String message;
+
+    public IncorrectCommand(String message) {
+        this.message = message;
+    }
+
+    /**
+     * Sends the error message to the Ui
+     *
+     * @return A CommandResult that tells the Ui to print the error message.
+     */
+    @Override
+    public CommandResult execute() {
+        return new CommandResult(message,PrintOptions.DEFAULT);
+    }
+}
diff --git a/src/main/java/commands/ListCommand.java b/src/main/java/commands/ListCommand.java
new file mode 100644
index 000000000..f1df7f7c3
--- /dev/null
+++ b/src/main/java/commands/ListCommand.java
@@ -0,0 +1,32 @@
+package commands;
+
+import task.Task;
+
+/**
+ * A Command class that contains methods that asks the Ui to print out the ArrayList.
+ */
+public class ListCommand extends Command{
+
+    public static final String LIST_IS_EMPTY = "You're a free man :)";
+    private static final String LIST_IS_NOT_EMPTY = "Here are the things you need to do :";
+    public static final String LIST_COMMAND = "list";
+    public static final int NO_TASKS = 0;
+
+    public ListCommand () {
+        super();
+    }
+
+    /**
+     * Sends the ArrayList to be printed to the Ui
+     *
+     * @return A CommandResult that tells the Ui to print the status of execution
+     * and the list (if not empty).
+     */
+    @Override
+    public CommandResult execute(){
+        if(Task.getTotalTasks() == NO_TASKS) {
+            return new CommandResult(LIST_IS_EMPTY,PrintOptions.DEFAULT);
+        }
+        return new CommandResult(LIST_IS_NOT_EMPTY,tasks,PrintOptions.LIST);
+    }
+}
diff --git a/src/main/java/commands/PrintOptions.java b/src/main/java/commands/PrintOptions.java
new file mode 100644
index 000000000..da7ac09df
--- /dev/null
+++ b/src/main/java/commands/PrintOptions.java
@@ -0,0 +1,9 @@
+package commands;
+
+/**
+ * Used to reduce the number of methods in the Ui class by determining
+ * what needs to be printed.
+ */
+public enum PrintOptions {
+    WITH_TASK_AND_NUMBER_OF_TASK,ONLY_TASK,LIST,DEFAULT,LIST_WITH_SPECIFIC_CONDITIONS
+}
diff --git a/src/main/java/constants/Message.java b/src/main/java/constants/Message.java
new file mode 100644
index 000000000..1866f339c
--- /dev/null
+++ b/src/main/java/constants/Message.java
@@ -0,0 +1,47 @@
+package constants;
+
+import static commands.ListCommand.LIST_IS_EMPTY;
+
+/**
+ * Messages that do not belong to any Commands.
+ */
+public class Message {
+
+    public static final String DIVIDER = "___________________________________________________________";
+    public static final String INDENTATION = "      ";
+    public static final String HELLO_MESSAGE_2 = "Hello! I'm Duke, your friendly neighbourhood task manager\n" +
+            INDENTATION + "What can I do for you? :D\n" + INDENTATION  + "(type help if you're not sure what to do!)";
+    public static final String LOGO = " ____        _        \n"
+            + "|  _ \\ _   _| | _____ \n"
+            + "| | | | | | | |/ / _ \\\n"
+            + "| |_| | |_| |   <  __/\n"
+            + "|____/ \\__,_|_|\\_\\___|\n";
+    public static final String TYPE_SUITABLE_COMMAND_MESSAGE = "Sorry," +
+            " I don't know what you mean, do type 'help' if you're unsure :)";
+    public static final String FILE_WRITING_ERROR_MESSAGE = "Oops, something unexpected happened while " +
+            "writing to file";
+    public static final String FILE_READING_ERROR_MESSAGE = "Oops, something unexpected happened while " +
+            "reading the file";
+    public static final String PROMPT_TASK_NUMBER = "Please tell me which task you want to select :)";
+    public static final String PROMPT_SENSIBLE_INDEX = "Please give a number between 1 and ";
+    public static final String DEFAULT_ERROR_MESSAGE = "Oops, something went wrong!";
+    public static final String FILE_ERROR_MESSAGE = "Oops, there might be something wrong with the file.";
+    public static final String FILE_NOT_CREATED = "Looks like you don't have a file for your tasks, " +
+            "let me create one now.....";
+    public static final String DONE = "Done!";
+    public static final String GETTING_TASK = "Getting your tasks.....";
+    public static final String PROMPT_NUMBER = "Please give me an integer :)";
+
+    /**
+     * Asks the user to give a number between 1 and the total number of tasks.
+     *
+     * @param number Total number of tasks
+     * @return Message
+     */
+    public static String giveSensibleRange(int number) {
+        if(number < 1) {
+            return LIST_IS_EMPTY;
+        }
+        return PROMPT_SENSIBLE_INDEX + number + " :)";
+    }
+}
diff --git a/src/main/java/duke/DefaultException.java b/src/main/java/duke/DefaultException.java
new file mode 100644
index 000000000..99868f48d
--- /dev/null
+++ b/src/main/java/duke/DefaultException.java
@@ -0,0 +1,7 @@
+package duke;
+
+/**
+ * An Exception class created for unexpected errors while running the program.
+ */
+public class DefaultException extends Exception{
+}
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
new file mode 100644
index 000000000..6f93d609c
--- /dev/null
+++ b/src/main/java/duke/Duke.java
@@ -0,0 +1,107 @@
+package duke;
+
+import commands.ExitCommand;
+import commands.CommandResult;
+import commands.Command;
+import commands.PrintOptions;
+
+import constants.Message;
+import parser.Parser;
+import storage.Storage;
+import task.Task;
+import tasklist.TaskList;
+import ui.Ui;
+
+import java.io.IOException;
+
+/**
+ * The class that contains the main code for the execution of the Duke Program.
+ */
+public class Duke {
+
+    private final Storage storage;
+    private final Ui ui;
+    private final TaskList tasks;
+
+    /**
+     * Creates a Duke object to run the application. It also tries to find and load
+     * the text file duke.txt.
+     */
+    public Duke() {
+        ui = new Ui();
+        storage = new Storage();
+        tasks = new TaskList();
+        ui.printStartingMessage();
+        ui.printMessage(Message.GETTING_TASK);
+        try {
+            storage.loadTextFile(tasks);
+            ui.printMessage(Message.DONE);
+        } catch (DukeException error) {
+            ui.printMessage(Message.FILE_NOT_CREATED);
+            ui.printMessage(Message.DONE);
+        } catch (IOException error) {
+            ui.printMessage(Message.FILE_READING_ERROR_MESSAGE);
+        } catch (Exception error) {
+            ui.printMessage(Message.FILE_ERROR_MESSAGE);
+            System.exit(1);
+        }
+    }
+
+    /**
+     * Repeats the process of getting an input from the user, creating a Parser to parse
+     * the input, creating a Command object based on the parsed input, then executing the
+     * command and showing the command output to the user.
+     * Stops when an ExitCommand is created.
+     */
+    //@@author vincentlauhl-reused
+    //Reused from https://github.com/se-edu/addressbook-level2/blob/master/src/seedu/addressbook/Main.java
+    //with minor modifications
+    public void run(){
+        Command command = null;
+        while (!(command instanceof ExitCommand)){
+            String input = ui.getUserCommand();
+            command = new Parser().parseInput(input);
+            CommandResult result = executeCommand(command);
+            ui.showResult(result);
+        }
+        exitProcess();
+    }
+    //@@author
+
+    private void exitProcess() {
+        try {
+            storage.saveTasksToFile(tasks);
+        } catch (IOException error) {
+            ui.printMessage(Message.FILE_WRITING_ERROR_MESSAGE);
+        }
+        System.exit(0);
+    }
+
+    public static void main(String[] args) {
+        new Duke().run();
+    }
+
+    /**
+     * Passes the tasks to the command and tries to execute the command. Returns
+     * appropriate error messages if execution fails.
+     *
+     * @param command Command that needs to be executed.
+     * @return Message and actions from the execution of the command.
+     */
+    private CommandResult executeCommand(Command command) {
+        String errorMessage;
+        try {
+            command.passTaskList(tasks);
+            return command.execute();
+        } catch (IndexOutOfBoundsException error) {
+            errorMessage = Message.giveSensibleRange(Task.getTotalTasks());
+        } catch (NumberFormatException error) {
+            errorMessage = Message.PROMPT_NUMBER;
+        } catch (DefaultException error) {
+            errorMessage = Message.DEFAULT_ERROR_MESSAGE;
+        } catch (DukeException error) {
+            errorMessage = Message.TYPE_SUITABLE_COMMAND_MESSAGE;
+        }
+        return new CommandResult(errorMessage, PrintOptions.DEFAULT);
+    }
+}
diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java
new file mode 100644
index 000000000..bca1bbdc8
--- /dev/null
+++ b/src/main/java/duke/DukeException.java
@@ -0,0 +1,7 @@
+package duke;
+
+/**
+ * An Exception class created for exceptions specific to duke.
+ */
+public class DukeException extends Exception{
+}
diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java
new file mode 100644
index 000000000..311b5b995
--- /dev/null
+++ b/src/main/java/parser/Parser.java
@@ -0,0 +1,216 @@
+package parser;
+
+import commands.Command;
+import commands.AddCommand;
+import commands.ExitCommand;
+import commands.FindCommand;
+import commands.IncorrectCommand;
+import commands.DeleteCommand;
+import commands.ListCommand;
+import commands.HelpCommand;
+import commands.DoneCommand;
+
+import constants.Message;
+import duke.DukeException;
+import task.TaskType;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+
+/**
+ * A class for parsing the input to determine the command to execute
+ */
+public class Parser {
+
+    private static final String TODO_FORMAT_ERROR = "Please type the todo in the format: 'todo (description)' :)";
+    private static final String DATE_FORMAT_ERROR = "Please write the date in the format of 'yyyy-MM-dd' :)";
+    private static final String DEADLINE_DESCRIPTION_AND_DATE_SPLITTER = " /by ";
+    private static final String EVENT_DESCRIPTION_AND_DATE_TIME_SPLITTER = " /at ";
+    private static final String FIND_FORMAT_ERROR = "Please type the find input in the format: \n" +
+            Message.INDENTATION + "- 'find /d yyyy-MM-dd' to find tasks with a specific date \n" +
+            Message.INDENTATION + "- 'find (description)' to find tasks with a specific description :)";
+    private static final int EXPECTED_LENGTH_FOR_DELETE_INPUT = 2;
+    private static final int EXPECTED_LENGTH_FOR_DONE_INPUT = 2;
+    private static final int FIND_STARTING_INDEX = 5;
+    private static final String EVENT_FROM_AND_TO_DATE_TIME_SPLITTER = " /to ";
+    private static final int TODO_STARTING_INDEX = 5;
+    private static final int DEADLINE_STARTING_INDEX = 9;
+    private static final int EVENT_STARTING_INDEX = 6;
+    public static final int WITH_DATE = 2;
+
+    /**
+     * Parses the input to determine the required Command object to be created.
+     * The command returned depends on the first word of the input before the
+     * first space. If the first word does not match any of the cases, a default
+     * error message is returned with the prompt to type 'help'.
+     *
+     * @param input Input from user
+     * @return Certain type of command depending on the input
+     */
+    public Command parseInput(String input) {
+        String type = input.split(" ")[0].toLowerCase();
+        switch(type) {
+        case AddCommand.TODO_COMMAND:
+            return executeTaskCase(input, TaskType.TODO, TODO_FORMAT_ERROR);
+        case AddCommand.DEADLINE_COMMAND:
+            return executeTaskCase(input, TaskType.DEADLINE, AddCommand.DEADLINE_FORMAT_ERROR);
+        case AddCommand.EVENT_COMMAND:
+            return executeTaskCase(input, TaskType.EVENT, AddCommand.EVENT_FORMAT_ERROR);
+        case ListCommand.LIST_COMMAND:
+            return new ListCommand();
+        case DoneCommand.DONE_COMMAND:
+            return executeDoneCase(input);
+        case HelpCommand.HELP_COMMAND:
+            return new HelpCommand();
+        case DeleteCommand.DELETE_COMMAND:
+            return executeDeleteCase(input);
+        case ExitCommand.EXIT_COMMAND:
+            return new ExitCommand();
+        case FindCommand.FIND_COMMAND:
+            return executeFindCase(input);
+        default :
+            return new IncorrectCommand(Message.TYPE_SUITABLE_COMMAND_MESSAGE);
+        }
+    }
+
+    private Command executeFindCase(String input) {
+        try {
+            return prepareFindCommand(input.strip().substring(FIND_STARTING_INDEX));
+        } catch (DateTimeParseException error) {
+            return new IncorrectCommand(DATE_FORMAT_ERROR);
+        } catch (Exception error) {
+            return new IncorrectCommand(FIND_FORMAT_ERROR);
+        }
+    }
+
+    private Command executeDeleteCase(String input) {
+        try {
+            return prepareDeleteCommand(input);
+        } catch (DukeException error) {
+            return new IncorrectCommand(Message.PROMPT_TASK_NUMBER);
+        } catch (NumberFormatException error) {
+            return new IncorrectCommand(Message.PROMPT_NUMBER);
+        }
+    }
+
+    private Command executeDoneCase(String input) {
+        try {
+            return prepareDoneCommand(input);
+        } catch (DukeException error) {
+            return new IncorrectCommand(Message.PROMPT_TASK_NUMBER);
+        } catch (NumberFormatException error) {
+            return new IncorrectCommand(Message.PROMPT_NUMBER);
+        }
+    }
+
+    private Command executeTaskCase(String input, TaskType type, String todoFormatError) {
+        try {
+            return prepareAddCommand(input, type);
+        } catch (StringIndexOutOfBoundsException error) {
+            return new IncorrectCommand(todoFormatError);
+        }
+    }
+
+    /**
+     * Parses the input further to create a different AddCommand Object for different task
+     * types. Returns an error message if something unexpected happens.
+     *
+     * @param input Input from the user
+     * @param type Type of task
+     * @return AddCommand object with a different parsed Output depending on the type of task
+     * @throws StringIndexOutOfBoundsException If the format of the input is incorrect
+     */
+    private Command prepareAddCommand(String input,TaskType type) throws StringIndexOutOfBoundsException {
+        String description;
+        String parsedOutputs[];
+        switch(type){
+        case TODO:
+            description = input.strip().substring(TODO_STARTING_INDEX);
+            parsedOutputs = new String[]{description};
+            return new AddCommand(parsedOutputs,TaskType.TODO);
+        case EVENT:
+            try {
+                description = input.strip().substring(EVENT_STARTING_INDEX);
+                parsedOutputs = getParsedOutputForEvent(description);
+                return new AddCommand(parsedOutputs,TaskType.EVENT);
+            } catch(ArrayIndexOutOfBoundsException error) {
+                return new IncorrectCommand(AddCommand.EVENT_FORMAT_ERROR);
+            }
+        case DEADLINE:
+            description = input.strip().substring(DEADLINE_STARTING_INDEX);
+            parsedOutputs = description.split(DEADLINE_DESCRIPTION_AND_DATE_SPLITTER);
+            return new AddCommand(parsedOutputs,TaskType.DEADLINE);
+        default:
+            return new IncorrectCommand(Message.DEFAULT_ERROR_MESSAGE);
+        }
+    }
+
+    private String[] getParsedOutputForEvent(String description) throws ArrayIndexOutOfBoundsException{
+        String[] parsedOutputs = new String[3];
+        parsedOutputs[0] = description.split(EVENT_DESCRIPTION_AND_DATE_TIME_SPLITTER)[0];
+        parsedOutputs[1] = description.split(EVENT_DESCRIPTION_AND_DATE_TIME_SPLITTER)[1].
+                split(EVENT_FROM_AND_TO_DATE_TIME_SPLITTER)[0];
+        parsedOutputs[WITH_DATE] = description.split(EVENT_DESCRIPTION_AND_DATE_TIME_SPLITTER)[1].
+                split(EVENT_FROM_AND_TO_DATE_TIME_SPLITTER)[1];
+        return parsedOutputs;
+    }
+
+    /**
+     * Parses the input further to create a different FindCommand object for finding task with
+     * a specific description / date.
+     *
+     * @param input Parsed input from the user.
+     * @return FindCommand object with a different parsed output depending on whether the
+     * description / date needs to be found
+     * @throws IndexOutOfBoundsException throws an exception when user inputs a number out
+     * of the range of the ArrayList
+     */
+    private FindCommand prepareFindCommand(String input) throws IndexOutOfBoundsException{
+        String[] parsedOutputs = input.split(" ");
+        if(parsedOutputs[0].equals("/d")) {
+            return new FindCommand(LocalDate.parse(parsedOutputs[1]));
+        } else {
+            return new FindCommand(parsedOutputs[0]);
+        }
+    }
+
+    /**
+     * Parses the input further to create a DoneCommand with the index of the task to be
+     * marked as done.
+     *
+     * @param input Parsed input from the user.
+     * @return DoneCommand object with the index of the completed task.
+     * @throws DukeException throws an exception when the input from the user
+     * is incorrect
+     * @throws NumberFormatException throws an exception when the user inputs
+     * something that is not an integer.
+     */
+    private DoneCommand prepareDoneCommand(String input) throws DukeException,
+            NumberFormatException{
+        if(input.split(" ").length < EXPECTED_LENGTH_FOR_DONE_INPUT) {
+            throw new DukeException();
+        }
+        int index = Integer.parseInt(input.split(" ")[1]) - 1;
+        return new DoneCommand(index);
+    }
+
+    /**
+     * Parses the input further to create a DoneCommand with the index of the task to be
+     * marked as done.
+     *
+     * @param input Parsed input from the user.
+     * @return DoneCommand object with the index of the completed task.
+     * @throws DukeException throws an exception when the input from the user
+     * is incorrect
+     * @throws NumberFormatException throws an exception when the user inputs
+     * something that is not an integer.
+     */
+    private DeleteCommand prepareDeleteCommand(String input) throws DukeException,
+            NumberFormatException {
+        if(input.split(" ").length < EXPECTED_LENGTH_FOR_DELETE_INPUT) {
+            throw new DukeException();
+        }
+        int index = Integer.parseInt(input.split(" ")[1]) - 1;
+        return new DeleteCommand(index);
+    }
+}
diff --git a/src/main/java/storage/Storage.java b/src/main/java/storage/Storage.java
new file mode 100644
index 000000000..ba1ce2f86
--- /dev/null
+++ b/src/main/java/storage/Storage.java
@@ -0,0 +1,96 @@
+package storage;
+
+import duke.DukeException;
+
+import task.Deadline;
+import task.Event;
+import task.Task;
+import task.ToDo;
+import tasklist.TaskList;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeParseException;
+import java.util.Scanner;
+
+/**
+ * A class that loads tasks to and saves tasks from the duke.txt file.
+ */
+public class Storage {
+
+    private static final String SEPARATOR_FOR_FILE = " / ";
+
+    public Storage() {}
+
+    /**
+     * Loads the tasks from duke.txt file and creates a file if no file is found.
+     *
+     * @param tasks The ArrayList to store the tasks in
+     * @throws IOException Throws an exception if something unexpected happens
+     * when reading the file
+     * @throws DukeException Throws an exception to tell the user the file is not
+     * found and a new file is created
+     */
+    public void loadTextFile(TaskList tasks) throws IOException, DukeException {
+        File file = new File("./duke.txt");
+        if(file.createNewFile()) {
+            throw new DukeException();
+        }
+        Scanner s = new Scanner(file);
+        while (s.hasNext()) {
+            addTaskFromFile(s,tasks);
+        }
+    }
+
+    /**
+     * Saves the tasks to the duke.txt file before the program stops
+     *
+     * @param tasks The ArrayList where the tasks are stored
+     * @throws IOException Throws an exception if something unexpected happens
+     *  when writing to the file.
+     */
+    public void saveTasksToFile(TaskList tasks) throws IOException{
+        FileWriter fw = new FileWriter ("./duke.txt");
+        for (int i = 0; i < Task.getTotalTasks(); i++) {
+            fw.write(tasks.getTask(i).getStatusIconAndDescriptionForFile() + System.lineSeparator());
+        }
+        fw.close();
+    }
+
+    /**
+     * Adds the tasks from the file and their completion status into the ArrayList
+     * in different ways depending on the type of task.
+     *
+     * @param s the Scanner which is reading the file
+     * @param tasks The ArrayList of tasks
+     * @throws IndexOutOfBoundsException Throws an exception if the format of tasks
+     * saved on the files are different.
+     */
+    private void addTaskFromFile(Scanner s, TaskList tasks) throws IndexOutOfBoundsException,
+            DateTimeParseException {
+        String[] parsedOutput = s.nextLine().split(SEPARATOR_FOR_FILE);
+        switch(parsedOutput[0]){
+        case ToDo.IDENTIFIER:
+            tasks.addTask(new ToDo(parsedOutput[2]));
+            updateTaskStatus(parsedOutput[1],tasks);
+            break;
+        case Event.IDENTIFIER:
+            tasks.addTask(new Event(parsedOutput[2], LocalDateTime.parse(parsedOutput[3]),
+                    LocalDateTime.parse(parsedOutput[4])));
+            updateTaskStatus(parsedOutput[1],tasks);
+            break;
+        case Deadline.IDENTIFIER:
+            tasks.addTask(new Deadline(parsedOutput[2], LocalDateTime.parse(parsedOutput[3])));
+            updateTaskStatus(parsedOutput[1],tasks);
+            break;
+        }
+    }
+
+    private void updateTaskStatus(String done, TaskList tasks) {
+        if (done.equals("1")) {
+            tasks.getTask(Task.getTotalTasks()-1).markAsDone();
+        }
+    }
+}
diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java
new file mode 100644
index 000000000..b35d61e8f
--- /dev/null
+++ b/src/main/java/task/Deadline.java
@@ -0,0 +1,40 @@
+package task;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * A Task class which contains the description of the task and date in which
+ * the task needs to be done.
+ */
+public class Deadline extends Task{
+    public static final String BY = "by: ";
+    protected LocalDateTime dateAndTime;
+    public static final String IDENTIFIER = "D";
+
+    public Deadline(String description,LocalDateTime date) {
+        this.description = description;
+        this.dateAndTime = date;
+    }
+
+    public LocalDateTime getDateAndTime () {
+        return dateAndTime;
+    }
+
+    @Override
+    public String getStatusIconAndDescription() {
+        String icon = (isDone ? "X" : " ");
+        return addSquareBrackets(IDENTIFIER) + addSquareBrackets(icon) + " " + description + " "
+                + addBrackets(BY + formatDateTime(dateAndTime));
+    }
+
+    private String formatDateTime(LocalDateTime DateAndTime) {
+        return DateAndTime.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm"));
+    }
+
+    @Override
+    public String getStatusIconAndDescriptionForFile() {
+        String icon = (isDone ? "1" : "0");
+        return  IDENTIFIER + SEPARATOR + icon + SEPARATOR + description + SEPARATOR + dateAndTime;
+    }
+}
diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java
new file mode 100644
index 000000000..5d6a85262
--- /dev/null
+++ b/src/main/java/task/Event.java
@@ -0,0 +1,43 @@
+package task;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * A Task Class that saves the description of the task and the period of
+ * date and time in which the task needs to be done.
+ */
+public class Event extends Task{
+    public static final String AT = "at: ";
+    protected LocalDateTime fromDateAndTime;
+    protected LocalDateTime toDateAndTime;
+    public static final String IDENTIFIER = "E";
+
+    public Event(String description, LocalDateTime fromDateAndTime, LocalDateTime toDateAndTime) {
+        this.description = description;
+        this.fromDateAndTime = fromDateAndTime;
+        this.toDateAndTime = toDateAndTime;
+    }
+
+    public LocalDateTime getFromDateAndTime () {
+        return fromDateAndTime;
+    }
+
+    @Override
+    public String getStatusIconAndDescription() {
+        String icon = (isDone ? "X" : " ");
+        return addSquareBrackets(IDENTIFIER) + addSquareBrackets(icon) + " " + description + " " +
+                addBrackets(AT + formatDateTime(fromDateAndTime) + " to " + formatDateTime(toDateAndTime));
+    }
+
+    private String formatDateTime(LocalDateTime DateAndTime) {
+        return DateAndTime.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm"));
+    }
+
+    @Override
+    public String getStatusIconAndDescriptionForFile() {
+        String icon = (isDone ? "1" : "0");
+        return  IDENTIFIER + SEPARATOR + icon + SEPARATOR + description + SEPARATOR + fromDateAndTime +
+                SEPARATOR + toDateAndTime;
+    }
+}
diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java
new file mode 100644
index 000000000..94700183c
--- /dev/null
+++ b/src/main/java/task/Task.java
@@ -0,0 +1,50 @@
+package task;
+
+
+/**
+ * An abstract class with the common methods and attributes for different types of Tasks.
+ */
+public abstract class Task {
+    protected static final String SEPARATOR = " / ";
+    protected boolean isDone;
+    protected String description;
+
+    private static int totalTasks = 0;
+
+    /**
+     * Gets the completion status and description of task when printing it as a list
+     *
+     * @return the status and description of a task in a specific format
+     */
+    public abstract String getStatusIconAndDescription();
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void markAsDone() {
+        isDone = true;
+    }
+
+    /**
+     * Gets the completion status and description of the task when saving them to a file
+     *
+     * @return the status and description of a task in a specific format
+     */
+    public abstract String getStatusIconAndDescriptionForFile();
+
+    public static int getTotalTasks() {
+        return totalTasks;
+    }
+
+    public static void setTotalTasks(int totalTasks) {
+        Task.totalTasks = totalTasks;
+    }
+
+    protected static String addSquareBrackets(String s) {
+        return "[" + s + "]";
+    }
+    protected static String addBrackets(String s) {
+        return "(" + s + ")";
+    }
+}
diff --git a/src/main/java/task/TaskType.java b/src/main/java/task/TaskType.java
new file mode 100644
index 000000000..1d0aabfd9
--- /dev/null
+++ b/src/main/java/task/TaskType.java
@@ -0,0 +1,8 @@
+package task;
+
+/**
+ * To differentiate between the different types of tasks.
+ */
+public enum TaskType {
+    TODO,DEADLINE,EVENT;
+}
diff --git a/src/main/java/task/ToDo.java b/src/main/java/task/ToDo.java
new file mode 100644
index 000000000..7294b4d1d
--- /dev/null
+++ b/src/main/java/task/ToDo.java
@@ -0,0 +1,24 @@
+package task;
+
+/**
+ * A Task class that saves the description of the task.
+ */
+public class ToDo extends Task{
+    public static final String IDENTIFIER = "T";
+
+    public ToDo(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String getStatusIconAndDescription() {
+        String icon = (isDone ? "X" : " ");
+        return addSquareBrackets(IDENTIFIER) + addSquareBrackets(icon) + " " + description;
+    }
+
+    @Override
+    public String getStatusIconAndDescriptionForFile() {
+        String icon = (isDone ? "1" : "0");
+        return  IDENTIFIER + SEPARATOR + icon + SEPARATOR + description;
+    }
+}
diff --git a/src/main/java/tasklist/TaskList.java b/src/main/java/tasklist/TaskList.java
new file mode 100644
index 000000000..496af4d0c
--- /dev/null
+++ b/src/main/java/tasklist/TaskList.java
@@ -0,0 +1,55 @@
+package tasklist;
+
+import task.Task;
+
+import java.util.ArrayList;
+
+/**
+ * A class that stores an ArrayList of tasks and the related methods for the ArrayList.
+ */
+public class TaskList {
+
+    private ArrayList<Task> tasks;
+    private int numberOfTasks;
+
+    public TaskList() {
+        this.tasks = new ArrayList<>();
+        this.numberOfTasks = 0;
+    }
+
+    /**
+     * @return Returns the number of tasks in the list produced by execution of FindCommand.
+     */
+    public int getNumberOfTasks() {
+        return numberOfTasks;
+    }
+
+    public void setNumberOfTask(int numberOfTasks) {
+        this.numberOfTasks = numberOfTasks;
+    }
+
+    public void addTask(Task task) {
+        tasks.add(task);
+        Task.setTotalTasks(Task.getTotalTasks() + 1);
+    }
+
+    /**
+     * Adds existing tasks to a new list when FindCommand is executed.
+     * This is to separate from the usual addTask method which increases
+     * the total number of tasks in the main ArrayList.
+     *
+     * @param task The task that needs to be printed after executing FindCommand.
+     */
+    public void addTaskForFindCommand(Task task) {
+        tasks.add(task);
+    }
+
+    public void deleteTask(int index) throws IndexOutOfBoundsException {
+        tasks.remove(index);
+        Task.setTotalTasks(Task.getTotalTasks() - 1);
+    }
+
+    public Task getTask(int index) throws IndexOutOfBoundsException{
+        return tasks.get(index);
+    }
+}
diff --git a/src/main/java/ui/Ui.java b/src/main/java/ui/Ui.java
new file mode 100644
index 000000000..9c69ee370
--- /dev/null
+++ b/src/main/java/ui/Ui.java
@@ -0,0 +1,152 @@
+package ui;
+
+import commands.CommandResult;
+
+import commands.PrintOptions;
+import constants.Message;
+import task.Task;
+
+import java.io.InputStream;
+import java.util.Scanner;
+
+/**
+ * A class with methods that interacts with the user by accepting inputs and printing results.
+ */
+public class Ui {
+
+    private final Scanner in;
+    private static final Boolean NOTIFY_NUMBER_OF_TASK = true;
+    private static final Boolean PRINT_TASK = true;
+
+    public Ui(){
+        this(System.in);
+    }
+
+    public Ui(InputStream in){
+        this.in = new Scanner(in);
+    }
+
+    public String getUserCommand() {
+        return in.nextLine();
+    }
+
+    /**
+     * Divides the outputs so that it looks neater
+     */
+    public void printIndentationAndDivider() {
+        System.out.print(Message.INDENTATION);
+        System.out.println(Message.DIVIDER);
+    }
+
+    public void printWordsWithIndentation(String words) {
+        System.out.print(Message.INDENTATION);
+        System.out.println(words);
+    }
+
+    /**
+     * Prints the logo and the welcome message in the given format.
+     */
+    public void printStartingMessage() {
+        System.out.println("Hello from\n" + Message.LOGO);
+        printIndentationAndDivider();
+        printWordsWithIndentation(Message.HELLO_MESSAGE_2);
+        printIndentationAndDivider();
+        System.out.println();
+    }
+
+    /**
+     * Prints messages to the user not issued by a CommandResult in the given format.
+     *
+     * @param message The message that needs to be printed
+     */
+    public void printMessage(String message) {
+        printIndentationAndDivider();
+        printWordsWithIndentation(message);
+        printIndentationAndDivider();
+        System.out.println();
+    }
+
+    /**
+     * Prints the result from the executed Commands in the given format.
+     *
+     * @param result CommandResult which contains the contents to be printed.
+     * @param notifyNumberOfTasks Determines whether the number of tasks in
+     *                           the list needs to be printed.
+     * @param printTask Determines whether the selected task needs to be printed.
+     */
+    private void printCommandResultMessage(CommandResult result, Boolean notifyNumberOfTasks, Boolean printTask) {
+        printIndentationAndDivider();
+        printWordsWithIndentation(result.message);
+        if(printTask) {
+            printWordsWithIndentation(result.task.getStatusIconAndDescription());
+        }
+        if(notifyNumberOfTasks){
+            printWordsWithIndentation(notifyNumberOfTasks());
+        }
+        printIndentationAndDivider();
+        System.out.println();
+    }
+
+    /**
+     * Selects the type of function needed to show the result of different executed Commands
+     * This reduces the number of methods needed in the Ui class.
+     *
+     * @param result CommandResult which contains the contents to be printed.
+     */
+    public void showResult(CommandResult result) {
+        switch(result.type){
+        case WITH_TASK_AND_NUMBER_OF_TASK:
+            printCommandResultMessage(result,NOTIFY_NUMBER_OF_TASK,PRINT_TASK);
+            break;
+        case ONLY_TASK:
+            printCommandResultMessage(result,!NOTIFY_NUMBER_OF_TASK,PRINT_TASK);
+            break;
+        case LIST_WITH_SPECIFIC_CONDITIONS:
+        case LIST:
+            printList(result);
+            break;
+        case DEFAULT:
+            printCommandResultMessage(result,!NOTIFY_NUMBER_OF_TASK,!PRINT_TASK);
+            break;
+        default:
+            printMessage(result.message);
+        }
+    }
+
+
+
+    /**
+     * Prints the task's description with its completion status
+     *
+     * @param result A CommandResult object which passes the list that needs to be printed
+     */
+    private void printTask(CommandResult result) {
+        int totalTasks;
+        if(result.type == PrintOptions.LIST_WITH_SPECIFIC_CONDITIONS) {
+            totalTasks = result.tasks.getNumberOfTasks();
+        } else {
+           totalTasks = Task.getTotalTasks();
+        }
+        for(int i = 0; i < totalTasks; i++) {
+            printWordsWithIndentation(i + 1 + "." + result.tasks.getTask(i).getStatusIconAndDescription());
+        }
+    }
+
+    /**
+     * Prints the list of tasks with the given format.
+     *
+     * @param result The CommandResult determines the message shown to the user
+     */
+    private void printList(CommandResult result) {
+        printIndentationAndDivider();
+        printWordsWithIndentation(result.message);
+        printTask(result);
+        printIndentationAndDivider();
+        System.out.println();
+    }
+
+    private String notifyNumberOfTasks() {
+        int taskNumber = Task.getTotalTasks();
+        return "Now you have " + taskNumber + " task(s) in the list";
+    }
+}
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e..b3ddd0653 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -5,3 +5,114 @@ Hello from
 | |_| | |_| |   <  __/
 |____/ \__,_|_|\_\___|
 
+      ___________________________________________________________
+      Hello! I'm Duke, your friendly neighbourhood task manager
+      What can I do for you? :D
+      (type help if you're not sure what to do!)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Getting your tasks.....
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Done!
+      ___________________________________________________________
+
+      ___________________________________________________________
+      I've added this to your list :D
+      [T][ ] borrow book
+      Now you have 1 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      I've added this to your list :D
+      [D][ ] return book (by: Sunday)
+      Now you have 2 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      I've added this to your list :D
+      [E][ ] project meeting (at: 4th Sep 2-3pm)
+      Now you have 3 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Sorry, you're missing some arguments, do type 'help' if you're unsure :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please tell me which task you want to select :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Here are the things you need to do :
+      1.[T][ ] borrow book
+      2.[D][ ] return book (by: Sunday)
+      3.[E][ ] project meeting (at: 4th Sep 2-3pm)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      You've completed the task! Well done!
+      [T][X] borrow book
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Here are the things you need to do :
+      1.[T][X] borrow book
+      2.[D][ ] return book (by: Sunday)
+      3.[E][ ] project meeting (at: 4th Sep 2-3pm)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please give me a number :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please give a number between 1 and 3 :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please give a number between 1 and 3 :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Alright, I've removed this task:
+      [T][X] borrow book
+      Now you have 2 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please tell me which task you want to select :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Please give a number between 1 and 2 :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Here are the things you need to do :
+      1.[D][ ] return book (by: Sunday)
+      2.[E][ ] project meeting (at: 4th Sep 2-3pm)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Alright, I've removed this task:
+      [D][ ] return book (by: Sunday)
+      Now you have 1 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Alright, I've removed this task:
+      [E][ ] project meeting (at: 4th Sep 2-3pm)
+      Now you have 0 task(s) in the list
+      ___________________________________________________________
+
+      ___________________________________________________________
+      You're a free man :)
+      ___________________________________________________________
+
+      ___________________________________________________________
+      Bye, hope to see you again soon! :)
+      ___________________________________________________________
+
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb..cc8592357 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,19 @@
+todo borrow book
+DeadLine return book /by Sunday
+Event project meeting /at 4th Sep 2-3pm
+DEADLINE /by Monday
+done
+list
+done 1
+list
+done -
+done 0
+done 5
+delete 1
+delete
+delete 0
+list
+delete 1
+delete 1
+list
+bye
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 087374464..d2d47e6e5 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,8 @@ REM delete output from previous run
 if exist ACTUAL.TXT del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java
+javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java  ..\src\main\java\task\*.java ..\src\main\java\tasklist\*.java  ..\src\main\java\ui\*.java  ..\src\main\java\commands\*.java ..\src\main\java\constants\*.java  ..\src\main\java\parser\*.java  ..\src\main\java\storage\*.java
+
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
@@ -15,7 +16,7 @@ IF ERRORLEVEL 1 (
 REM no error here, errorlevel == 0
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT