diff --git a/README.md b/README.md
index 8715d4d91..1e5ea64be 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Duke project template
+# Duke
 
 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.
 
@@ -17,7 +17,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    ```
    Hello from
     ____        _        
-   |  _ \ _   _| | _____ 
+   |  _ \ _   _| | _____
    | | | | | | | |/ / _ \
    | |_| | |_| |   <  __/
    |____/ \__,_|_|\_\___|
diff --git a/data/brave.txt b/data/brave.txt
new file mode 100644
index 000000000..8fb79feed
--- /dev/null
+++ b/data/brave.txt
@@ -0,0 +1,5 @@
+T , 1 , read book
+D , 1 , return book , June 6th
+E , 0 , project meeting , Aug 6th 2-4pm
+T , 1 , join sports club
+T , 0 , cs2113 lecture
diff --git a/docs/README.md b/docs/README.md
index 8077118eb..6ec078cc3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,29 +1,217 @@
 # User Guide
 
+Brave is a **Command Line Interface (CLI) application** for you to manage your daily task
+Todo - Event - Deadline
+
+- [Quick Start](#quick-start)
+- [Features](#features)
+    - [Adding a Todo: `todo`](#adding-a-todo-todo)
+    - [Adding a Deadline: `deadline`](#adding-a-deadline-deadline)
+    - [Adding an Event: `event`](#adding-an-event-event)
+    - [Listing all tasks: `list`](#listing-out-all-tasks-list)
+    - [Marking a task as done: `mark`](#marking-a-task-as-completed-mark)
+    - [Marking a task as incomplete : `unmark`](#marking-a-task-as-incomplete-unmark)
+    - [Deleting a task: `delete`](#deleting-a-task-delete)
+    - [Searching for tasks: `find`](#searching-for-tasks-find)
+    - [Exiting the program: `bye`](#exiting-the-program-bye)
+
+## Quick Start
+1. Prerequisites: JDK 11, update Intellij to the most recent version.
+2. Download the latest copy of `ip.jar` from the [Releases](https://github.com/johnsuharjono/ip/releases) page.
+3. Open your Command Prompt (Windows) or Terminal (Mac/Linux), and navigate to the folder you created.
+4. Run the command `java -jar ip.jar`, this will be shown in your terminal if successfull
+    ```
+    -*|Brave|*------------------------------------
+    Greetings from
+      ____                        _ 
+     | __ ) _ __ __ ___   _____  | |
+     |  _ \| '__/ _` \ \ / / _ \ | |
+     | |_) | | | (_| |\ V /  __/ |_|
+     |____/|_|  \__,_| \_/ \___| (_)
+    
+    What can I do for you?
+    ----------------------------------------------
+    ```
+
 ## Features 
 
-### Feature-ABC
+### Adding a Todo: `todo`
+
+Create a To-Do type task
+
+**Format:** `todo <description>`
+
+**Example Input:**
+```
+todo learn web development
+```
+
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+Okay! I have added task below!
+[T][ ] learn web development
+You currently have 6 task in the list
+----------------------------------------------
+```
+
+### Adding a Deadline: `deadline`
+
+Create a Deadline type task
+
+**Format:** `deadline <description> /by <time>`
+
+**Example Input:**
+```
+deadline finish math homework /by Thursday Morning
+```
+
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+Okay! I have added task below!
+[D][ ] finish math homework (by: Thursday Morning)
+You currently have 8 task in the list
+----------------------------------------------
+```
+
+### Adding an Event: `event`
+
+Add an Event type task
+
+**Format:** `event <description> /at <time>`
+
+**Example Input:**
+```
+event Brave's birthday /at 4 March 2022
+```
+
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+Okay! I have added task below!
+[E][ ] Brave's birthday (at: 4 March 2022)
+You currently have 7 task in the list
+----------------------------------------------
+```
+
+### Listing out all tasks: `list`
+
+Shows all currently stored task by Brave
+
+**Format:** `list`
+
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+1 [T][X] read book
+2 [D][X] return book (by: June 6th)
+3 [E][ ] project meeting (at: Aug 6th 2-4pm)
+4 [T][X] join sports club
+5 [T][ ] cs2113 lecture
+6 [T][ ] learn web development
+7 [E][ ] Brave's birthday (at: 4 March 2022)
+8 [D][ ] finish math homework (by: Thursday Morning)
+----------------------------------------------
+```
+
+### Marking a task as completed: `mark`
+
+Brave will mark the given task as completed
+
+**Format:** `mark <index>`
+
+> **️ Note:** index can be seen from calling `list` command
+
+
+**Example Input:**
+```
+mark 3
+```
+
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+Nice! I've marked this task as done:
+[E][X] project meeting (at: Aug 6th 2-4pm)
+----------------------------------------------
+```
 
-Description of the feature.
+### Marking a task as incomplete: `unmark`
 
-### Feature-XYZ
+Brave will mark the given task as incomplete
 
-Description of the feature.
+**Format:** `unmark <index>`
 
-## Usage
+> **️ Note:** index can be seen from calling `list` command
 
-### `Keyword` - Describe action
 
-Describe the action and its outcome.
+**Example Input:**
+```
+unmark 3
+```
 
-Example of usage: 
+**Example Output:**
+```
+-*|Brave|*------------------------------------
+OK, I've marked this task as not done yet:
+[E][ ] project meeting (at: Aug 6th 2-4pm)
+----------------------------------------------
+```
+
+### Deleting a task: `delete`
 
-`keyword (optional arguments)`
+Remove a task stored by Brave.
 
-Expected outcome:
+**Format:** `delete <index>`
 
-Description of the outcome.
+> **Note:**  
+> `<index>` can be referenced from the `list` command.
 
+**Example Input:**
 ```
-expected output
+delete 6
+```
+
+**Example Output:**
 ```
+-*|Brave|*------------------------------------
+I managed to delete task below!
+[T][ ] learn web development
+You now have 7 task remaining
+----------------------------------------------
+```
+
+### Searching for tasks: `find`
+
+Filter the task base on `<keyword>`
+
+**Format:** `find <keyword>`
+
+**Example Input:**
+```
+find book
+```
+
+**Example Output:**
+```
+find book
+-*|Brave|*------------------------------------
+1 [T][X] read book
+2 [D][X] return book (by: June 6th)
+----------------------------------------------
+```
+
+### Exiting the program: `bye`
+
+Quits the program.
+
+**Format:** `bye`
+
+**Output:**
+```
+-*|Brave|*------------------------------------
+Bye, Hope to see you again soon!
+----------------------------------------------
+```
+
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 000000000..c4192631f
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
\ No newline at end of file
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..a98fc5530
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: brave.Brave
+
diff --git a/src/main/java/brave/Brave.java b/src/main/java/brave/Brave.java
new file mode 100644
index 000000000..cffd56a96
--- /dev/null
+++ b/src/main/java/brave/Brave.java
@@ -0,0 +1,61 @@
+package brave;
+
+import brave.data.TaskManager;
+import brave.parser.Parser;
+import brave.ui.Ui;
+import brave.storage.Storage;
+
+import java.io.IOException;
+import java.lang.String;
+import java.nio.file.Path;
+
+
+/**
+ * Represent the entry point for Brave-Bot Task Helper
+ * Initialize the UI, TaskManager, and Storage component.
+ */
+public class Brave {
+
+    private final Ui ui;
+    private TaskManager tasks;
+    private final Storage storage;
+
+    /**
+     * Initialize the UI, loading the file data from storage
+     *
+     * @param filePath filepath for the program to read from
+     */
+    public Brave(String filePath) {
+        ui = new Ui();
+        storage = new Storage(filePath);
+        try {
+            tasks = new TaskManager(storage.load());
+        } catch (IOException e) {
+            ui.showLoadingError(e.getMessage());
+            tasks = new TaskManager();
+        }
+    }
+
+    /**
+     * Read the user input command,
+     * Keep iterating until stop condition is reached
+     */
+    public void run() {
+        ui.showWelcomeMessage();
+        boolean isExit = false;
+
+        while (!isExit) {
+            String fullCommand = ui.getUserCommand();
+            Parser p = new Parser(ui, storage);
+            p.parse(fullCommand, tasks);
+            isExit = p.getExit();
+        }
+
+        ui.showFarewellMessage();
+    }
+
+    public static void main(String[] args) {
+        String DIR_PATH = String.valueOf(Path.of(System.getProperty("user.dir"), "data"));
+        new Brave(DIR_PATH + "/brave.txt").run();
+    }
+}
diff --git a/src/main/java/brave/IllegalArgumentException.java b/src/main/java/brave/IllegalArgumentException.java
new file mode 100644
index 000000000..e0bd5a002
--- /dev/null
+++ b/src/main/java/brave/IllegalArgumentException.java
@@ -0,0 +1,4 @@
+package brave;
+
+public class IllegalArgumentException extends Exception{
+}
diff --git a/src/main/java/brave/data/Deadline.java b/src/main/java/brave/data/Deadline.java
new file mode 100644
index 000000000..75d555cf5
--- /dev/null
+++ b/src/main/java/brave/data/Deadline.java
@@ -0,0 +1,40 @@
+package brave.data;
+
+/**
+ * Inherit from Task class, with additional "by" as the deadline
+ */
+public class Deadline extends Task {
+    private String by;
+
+    /**
+     * Class constructor
+     * @param description description for the given task
+     * @param by indicating the deadline of given task
+     */
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+
+    public String getDescription() {
+        return super.getDescription() + String.format(" (by: %s)", this.by);
+    }
+
+    /**
+     * Override print method
+     * @return String that is correctly formatted
+     */
+    @Override
+    public String toString() {
+        return "[D]" + super.toString();
+    }
+
+    @Override
+    public String getSaveFormat() {
+        if (!isDone) {
+            return "D , 0 , " + this.description + " , " + this.by;
+        } else {
+            return "D , 1 , " + this.description + " , " + this.by;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/brave/data/Event.java b/src/main/java/brave/data/Event.java
new file mode 100644
index 000000000..90e8c1b8b
--- /dev/null
+++ b/src/main/java/brave/data/Event.java
@@ -0,0 +1,38 @@
+package brave.data;
+
+/**
+ * Inherit from the Task class
+ * Represent an event task with description and the happening date and time of it.
+ */
+public class Event extends Task {
+    private String eventTime;
+
+    /**
+     * Class constructor.
+     *
+     * @param description description of the event task
+     * @param eventTime happening date and time of the event task
+     */
+    public Event(String description, String eventTime) {
+        super(description);
+        this.eventTime = eventTime;
+    }
+
+    public String getDescription() {
+        return super.getDescription() + String.format(" (at: %s)", this.eventTime);
+    }
+
+    @Override
+    public String toString() {
+        return "[E]" + super.toString();
+    }
+
+    @Override
+    public String getSaveFormat() {
+        if (!isDone) {
+            return "E , 0 , " + this.description + " , " + this.eventTime;
+        } else {
+            return "E , 1 , " + this.description + " , " + this.eventTime;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/brave/data/Task.java b/src/main/java/brave/data/Task.java
new file mode 100644
index 000000000..51746212d
--- /dev/null
+++ b/src/main/java/brave/data/Task.java
@@ -0,0 +1,46 @@
+package brave.data;
+
+/**
+ * Abstract class that act as the parent for Todo, Deadline, and Event.
+ */
+public abstract class Task {
+    protected String description;
+    protected boolean isDone;
+
+    /**
+     * Class Constructor
+     * @param description description for the given task
+     */
+    public Task(String description) {
+        this.description = description;
+        this.isDone = false;
+    }
+
+    /**
+     * Get the status of the given task.
+     *
+     * @return "X" if the task is completed.
+     */
+    public String getStatusIcon() {
+        return (isDone ? "[X]" : "[ ]"); // mark done task with X
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void markAsDone() {
+        isDone = true;
+    }
+
+    public void unmarkAsDone() {
+        isDone = false;
+    }
+
+    @Override
+    public String toString() {
+        return getStatusIcon() + " " + getDescription();
+    }
+
+    public abstract String getSaveFormat();
+}
diff --git a/src/main/java/brave/data/TaskManager.java b/src/main/java/brave/data/TaskManager.java
new file mode 100644
index 000000000..2237dd4de
--- /dev/null
+++ b/src/main/java/brave/data/TaskManager.java
@@ -0,0 +1,73 @@
+package brave.data;
+
+import brave.ui.Ui;
+
+import java.util.ArrayList;
+
+/**
+ * This class is used to manage the entire list of task
+ */
+public class TaskManager {
+    private final ArrayList<Task> tasks;
+    private final Ui ui = new Ui();
+
+    /**
+     * Class Constructor, initialise an empty array list if no file found
+     */
+    public TaskManager() {
+        tasks = new ArrayList<>();
+    }
+    /**
+     * Class Constructor, initialise an array of list from the file
+     */
+    public TaskManager(ArrayList<Task> tasks) {
+        this.tasks = tasks;
+    }
+
+    public ArrayList<Task> getTasks() {
+        return tasks;
+    }
+
+    /**
+     * Add a new task to the task list.
+     *
+     * @param task the new task
+     */
+    public void addTask(Task task) {
+        tasks.add(task);
+        ui.showAddTaskMessage(task, tasks.size());
+    }
+
+    /**
+     * Mark the task as finished
+     *
+     * @param taskIndex index of the task
+     */
+    public void markTask(int taskIndex) {
+        Task selected_task = tasks.get(taskIndex);
+        selected_task.markAsDone();
+        ui.showMarkTaskMessage(selected_task);
+    }
+
+    /**
+     * Mark the task as unfinished
+     *
+     * @param taskIndex index of the task
+     */
+    public void unmarkTask(int taskIndex) {
+        Task selected_task = tasks.get(taskIndex);
+        selected_task.unmarkAsDone();
+        ui.showUnmarkTaskMessage(selected_task);
+    }
+
+    /**
+     * Delete the task with a specific index.
+     *
+     * @param taskIndex the index of the task to be deleted
+     */
+    public void deleteTask(int taskIndex)  {
+        Task selected_task = tasks.get(taskIndex);
+        ui.showDeleteTaskMessage(selected_task, tasks.size());
+        tasks.remove(taskIndex);
+    }
+}
diff --git a/src/main/java/brave/data/Todo.java b/src/main/java/brave/data/Todo.java
new file mode 100644
index 000000000..62d64cdf2
--- /dev/null
+++ b/src/main/java/brave/data/Todo.java
@@ -0,0 +1,30 @@
+package brave.data;
+
+/**
+ * Inherit from Task class
+ * Represent the type of task To-Do that only have description
+ */
+public class Todo extends Task {
+    /**
+     * Class constructor specifying whether the task is done.
+     *
+     * @param description description of the todo task
+     */
+    public Todo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String getSaveFormat() {
+        if (!isDone) {
+            return "T , 0 , " + description;
+        } else {
+            return "T , 1 , " + description;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/brave/parser/Parser.java b/src/main/java/brave/parser/Parser.java
new file mode 100644
index 000000000..2e32d1e49
--- /dev/null
+++ b/src/main/java/brave/parser/Parser.java
@@ -0,0 +1,124 @@
+package brave.parser;
+
+import brave.IllegalArgumentException;
+import brave.data.*;
+import brave.storage.Storage;
+import brave.ui.Ui;
+
+import java.util.ArrayList;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * Parses user input
+ * After parsing execute the given input
+ */
+public class Parser {
+
+    private static boolean isExit;
+    private final Ui ui;
+    private final Storage storage;
+
+    public Parser(Ui ui, Storage storage) {
+        this.ui = ui;
+        this.storage = storage;
+    }
+
+    public void setExit(boolean exit) {
+        isExit = exit;
+    }
+
+    public boolean getExit() {
+        return isExit;
+    }
+
+    /**
+     * Parses user input into a command for execution
+     *
+     * @param fullCommand the full user input command
+     * @param tasks       the TaskManager object containing all the tasks and action
+     * @throws IllegalArgumentException If the command is not recognized
+     */
+    public void parse(String fullCommand, TaskManager tasks) {
+        String[] splitInputs = fullCommand.split(" ", 2);
+        String command = splitInputs[0]; //e.g. mark 2 -> take the first word as the command -> "mark"
+
+        if (command.equals("bye")) {
+            storage.save(tasks.getTasks());
+            setExit(true);
+            return;
+        }
+
+        String description;
+        switch (command) {
+        case "list":
+            ui.printTaskList(tasks.getTasks());
+            break;
+        case "mark":
+            try {
+                tasks.markTask(Integer.parseInt(splitInputs[1]) - 1); // 0 indexing
+            } catch (NumberFormatException e) {
+                System.out.println("Please put in integer value");
+            } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
+                System.out.println("Please put in valid number of task");
+            }
+            break;
+        case "unmark":
+            try {
+                tasks.unmarkTask(Integer.parseInt(splitInputs[1]) - 1); // 0 indexing
+            } catch (NumberFormatException e) {
+                System.out.println("Please put in integer value");
+            } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
+                System.out.println("Please put in valid number of task");
+            }
+            break;
+        case "todo":
+            try {
+                description = splitInputs[1];
+                tasks.addTask(new Todo(description));
+            } catch (IndexOutOfBoundsException e) {
+                System.out.println(" ☹ OOPS!!! The description of a todo cannot be empty.");
+            }
+            break;
+        case "deadline":
+            String[] arguments = splitInputs[1].split(" /by ", 2);
+            description = arguments[0];
+            String by = arguments[1];
+            tasks.addTask(new Deadline(description, by));
+            break;
+        case "event":
+            arguments = splitInputs[1].split(" /at ", 2);
+            description = arguments[0];
+            String eventTime = arguments[1];
+            tasks.addTask(new Event(description, eventTime));
+            break;
+        case "delete":
+            try {
+                tasks.deleteTask(Integer.parseInt(splitInputs[1]) - 1); // 0 indexing
+            } catch (NumberFormatException e) {
+                System.out.println("Please put in integer value");
+            } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
+                System.out.println("Please put in valid number of task");
+            }
+            break;
+        case "find":
+            try {
+                String params = splitInputs[1];
+                ArrayList<Task> filteredTask = (ArrayList<Task>) tasks.getTasks().stream().filter(task -> task.getDescription().toLowerCase().contains(params.toLowerCase())).collect(toList());
+
+                ui.printTaskList(filteredTask);
+            } catch (IndexOutOfBoundsException e) {
+                System.out.println("Brave need something to search for!!");
+            }
+            break;
+        default:
+            try {
+                throw new IllegalArgumentException();
+            } catch (IllegalArgumentException e) {
+                System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-(");
+                System.out.println("Available command are -> list/mark/unmark/todo/deadline/event");
+            }
+            break;
+        }
+    }
+}
diff --git a/src/main/java/brave/storage/Storage.java b/src/main/java/brave/storage/Storage.java
new file mode 100644
index 000000000..b7c5e4c4d
--- /dev/null
+++ b/src/main/java/brave/storage/Storage.java
@@ -0,0 +1,114 @@
+package brave.storage;
+
+import brave.data.Deadline;
+import brave.data.Event;
+import brave.data.Task;
+import brave.data.Todo;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+/**
+ * This class is used to manage all things related to File Management
+ * Loading and saving the file, decoding and encoding the file format
+ */
+
+public class Storage {
+    private String filePath;
+
+    public Storage(String filePath) {
+        this.filePath = filePath;
+    }
+
+    /**
+     * When the program start, load the file from the storage
+     *
+     * @return the list of task read from file
+     * @throws IOException If an output exception occurs
+     */
+    public ArrayList<Task> load() throws IOException {
+        File dir = new File(String.valueOf(Path.of(System.getProperty("user.dir"), "data")));
+        if (!dir.exists()) dir.mkdir();
+
+        File f = new File(filePath); // create a File for the given file path
+        if (!f.exists()) {
+            System.out.println("file not exist, creating a new file!");
+            f.createNewFile();
+        }
+        Scanner s = new Scanner(f); // create a Scanner using the File as the source
+        ArrayList<Task> tasks = new ArrayList<>();
+        decode(s, tasks);
+        return tasks;
+    }
+
+    /**
+     * Decodes the strings loaded from storage file into a list of tasks.
+     *
+     * @param s     scanner use to read the file
+     * @param tasks the data loaded from storage file as a list of strings
+     */
+    private static void decode(Scanner s, ArrayList<Task> tasks) {
+        int taskIndex = -1;
+        while (s.hasNext()) {
+            taskIndex++;
+            Task selected_task;
+            String[] details = s.nextLine().split(" , ", 0);
+            switch (details[0]) {
+            case "T":
+                tasks.add(new Todo(details[2]));
+                if (details[1].equals("1")) {
+                    selected_task = tasks.get(taskIndex);
+                    selected_task.markAsDone();
+                }
+                break;
+            case "D":
+                tasks.add(new Deadline(details[2], details[3]));
+                if (details[1].equals("1")) {
+                    selected_task = tasks.get(taskIndex);
+                    selected_task.markAsDone();
+                }
+                break;
+            case "E":
+                tasks.add(new Event(details[2], details[3]));
+                if (details[1].equals("1")) {
+                    selected_task = tasks.get(taskIndex);
+                    selected_task.markAsDone();
+                }
+                break;
+            }
+        }
+    }
+
+    /**
+     * Save the list by writing on filepath that we provide
+     *
+     * @param tasks list of task that will be written to the file
+     */
+    public void save(ArrayList<Task> tasks) {
+        encode(tasks, filePath);
+    }
+
+    /**
+     * Encodes the list of tasks into a list of strings to be stored in storage file.
+     *
+     * @param tasks    the list of tasks to be stored
+     * @param filePath filepath destination
+     */
+    private void encode(ArrayList<Task> tasks, String filePath) {
+        try {
+            FileWriter fw = new FileWriter(filePath);
+            StringBuilder toFile = new StringBuilder();
+            for (Task task : tasks) {
+                toFile.append(task.getSaveFormat()).append("\n");
+            }
+            fw.write(toFile.toString());
+            fw.close();
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/brave/ui/Ui.java b/src/main/java/brave/ui/Ui.java
new file mode 100644
index 000000000..1b7af547b
--- /dev/null
+++ b/src/main/java/brave/ui/Ui.java
@@ -0,0 +1,91 @@
+package brave.ui;
+
+import brave.data.Task;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+/**
+ *  Handles the UI of the application
+ *  Handles interaction with the user
+ */
+public class Ui {
+    String input;
+    private final Scanner in;
+    public static final String LINE_OPENER = "-*|Brave|*------------------------------------";
+    public static final String LINE_CLOSER = "----------------------------------------------";
+    public static final int DELETE_INDEX_OFFSET = 1;
+
+    public Ui() {
+        in = new Scanner(System.in);
+    }
+
+    public String getUserCommand() {
+        input = in.nextLine();
+        return input;
+    }
+
+    public void showLoadingError(String message) {
+        System.out.println("\t Error: Failed to load data.");
+        System.out.println("\t " + message);
+    }
+
+    public void showWelcomeMessage() {
+        System.out.println(LINE_OPENER);
+        System.out.println("Greetings from");
+        System.out.println("  ____                        _ \n" +
+                " | __ ) _ __ __ ___   _____  | |\n" +
+                " |  _ \\| '__/ _` \\ \\ / / _ \\ | |\n" +
+                " | |_) | | | (_| |\\ V /  __/ |_|\n" +
+                " |____/|_|  \\__,_| \\_/ \\___| (_)\n");
+        System.out.println("What can I do for you?");
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void showFarewellMessage() {
+        System.out.println(LINE_OPENER);
+        System.out.println("Bye, Hope to see you again soon!");
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void printTaskList(ArrayList<Task> tasks) {
+        if (tasks.size() == 0) {
+            System.out.println("You currently have no task!");
+            return;
+        }
+        System.out.println(LINE_OPENER);
+        for (Task task : tasks) {
+            System.out.println(String.format("%d ", tasks.indexOf((task)) + 1) + task);
+        }
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void showAddTaskMessage(Task task, int size) {
+        System.out.println(LINE_OPENER);
+        System.out.println("Okay! I have added task below!");
+        System.out.println(task);
+        System.out.println("You currently have " + size + " task in the list");
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void showDeleteTaskMessage(Task task, int size) {
+        System.out.println(LINE_OPENER);
+        System.out.println("I managed to delete task below!");
+        System.out.println(task);
+        System.out.println("You now have " + (size-DELETE_INDEX_OFFSET) + " task remaining");
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void showMarkTaskMessage(Task task) {
+        System.out.println(LINE_OPENER);
+        System.out.println("Nice! I've marked this task as done:");
+        System.out.println(task);
+        System.out.println(LINE_CLOSER);
+    }
+
+    public void showUnmarkTaskMessage(Task task) {
+        System.out.println(LINE_OPENER);
+        System.out.println("OK, I've marked this task as not done yet:");
+        System.out.println(task);
+        System.out.println(LINE_CLOSER);
+    }
+}