diff --git a/data/duke.txt b/data/duke.txt
new file mode 100644
index 0000000000..cce6db61aa
--- /dev/null
+++ b/data/duke.txt
@@ -0,0 +1 @@
+1. [D] [X] deadline ass  (by:  0202)
diff --git a/docs/README.md b/docs/README.md
index fd44069597..dfc47a5490 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,19 +2,151 @@
 
 ## Features 
 
-### Feature 1 
-Description of feature.
+### 1. Add Todo
+Add a todo task to your task list.
+
+### 2. Add Deadline
+Add a deadline to your task list.
+
+### 3. Add Event
+Add an event to your task list.
+
+### 4. Mark task as Done
+Mark a task in your task list as done.
+
+### 5. List all tasks
+List all tasks in your task list.
+
+### 6. Delete task
+Delete a task from your task list.
+
+### 7. Find task
+Find tasks containing a keyword.
+
+### 8. Save task list
+Save your task list to a .txt file.
 
 ## Usage
 
-### `Keyword` - Describe action
+### `todo <task description>` - Add a Todo task
 
-Describe action and its outcome.
+Add a Todo task to your task list.
 
-Example of usage: 
+Example of usage:
 
-`keyword (optional arguments)`
+`todo read book`
 
 Expected outcome:
 
-`outcome`
+`____________________________________________________________
+Got it. I've added this task: `
+`[T][✗] read book`
+`Now you have 1 tasks in the list.`
+`____________________________________________________________`
+
+### `deadline <task description> /by <date>` - Add a Deadline
+
+Add a Deadline task to your task list.
+
+Example of usage:
+
+`deadline return book /by Monday`
+
+Expected outcome:
+
+`____________________________________________________________
+Got it. I've added this task: `
+`[D][✗] return book (by: Monday)`
+`Now you have 2 tasks in the list.`
+`____________________________________________________________`
+
+### `event <task description> /at <date>` - Add an Event
+
+Add an Event task to your task list.
+
+Example of usage:
+
+`event book fair /at 5pm Tuesday`
+
+Expected outcome:
+
+`____________________________________________________________
+Got it. I've added this task: `
+`[E][✘] book fair (at: 5pm Tuesday)`
+`Now you have 3 tasks in the list.`
+`____________________________________________________________`
+
+### `done <task index>` - Mark task as done
+
+Mark a task in your task list as done.
+
+Example of usage:
+
+`done 1`
+
+Expected outcome:
+
+`____________________________________________________________
+Nice! I've marked this task as done: `
+`[[T][✓] read book`
+`____________________________________________________________`
+
+### `list` - List all tasks
+
+List all tasks in your task list.
+
+Example of usage:
+
+`list`
+
+Expected outcome:
+
+`____________________________________________________________
+Here are the tasks in your list: `
+`1. [T][✓] read book`
+`2. [D][✘] return book (by: Monday)`
+`3. [E][✘] book fair (at: 5pm Tuesday)`
+`____________________________________________________________`
+
+### `delete <task index>` - Delete a task
+ 
+Delete a task from your task list.
+
+Example of usage:
+
+`delete 1`
+
+Expected outcome:
+
+`____________________________________________________________`
+`Removed: [T][✓] read book`
+`Now you have 2 task(s) in your list`
+`____________________________________________________________`
+
+### `find <keyword>` - Find tasks
+
+Find tasks with matching keyword.
+
+Example of usage:
+
+`find book`
+
+Expected outcome:
+
+
+`Here are the matching tasks in your list: `
+`1. [D][✘] return book (by: Monday)`
+`2. [E][✘] book fair (at: 5pm Tuesday)`
+
+### `save` - Save task list
+
+Save task list to .txt file.
+
+Example of usage:
+
+`save`
+
+Expected outcome:
+
+	`Successfully saved to file!`
+
diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java
new file mode 100644
index 0000000000..a65f4c979d
--- /dev/null
+++ b/src/main/duke/Duke.java
@@ -0,0 +1,115 @@
+package main.duke;
+import java.util.Scanner;
+
+
+public class Duke {
+    public static void main(String[] args) {
+        //Generates a greeting
+        greeting();
+        request();
+    }
+
+    public static void request(){
+        Scanner in = new Scanner(System.in);
+        Task[] list = new Task[100];
+        String line;
+        int i=0,j;
+        int task_count = 0;
+        while(true) {
+            String status ="[✗] ";
+            line = in.nextLine();
+
+            if (line.equals("bye")){
+                System.out.println("____________________________________________________________\n"
+                        +"Bye. Hope to see you again soon!\n"
+                +"____________________________________________________________\n");
+                break;
+            }else if(line.equals("list")){
+                for(j=0;j<i;j++){
+                    if(list[j].isDone){
+                        System.out.println((j+1)+ ". " + "[✓]" + list[j].description);
+                    }//not done
+                    else {
+                        System.out.println((j + 1) + ". " + "[✗] " + list[j].description);
+                    }
+                }
+            }else if(line.contains("done")){
+                int num = Integer.parseInt(line.substring(5));
+                System.out.println(num);
+                list[num-1].isDone = true;
+                System.out.println("____________________________________________________________\n"+
+                        "Nice! I've marked this task as done:");
+                System.out.println("[✓] "+ list[num-1].description + "\n____________________________________________________________\n");
+            }else if(line.contains("todo")) {
+                try{
+                    String desc[] = line.split(" ");
+                    list[i] = new Deadline(desc[0], desc[1]);
+                    System.out.println("____________________________________________________________\n" +
+                        "Got it. I've added this task: ");
+                    task_count++;
+                    System.out.println("[T][✗] " + list[i].description);
+                    System.out.println("Now you have " + task_count + " tasks in the list.");
+                    System.out.println("____________________________________________________________\n");
+                i++;
+                }catch(ArrayIndexOutOfBoundsException e){
+                    System.out.println("____________________________________________________________\n" +
+                            "☹ OOPS!!! The description of a todo cannot be empty.");
+                    System.out.println("____________________________________________________________\n");
+                }
+
+            }else if(line.contains("deadline")){
+                try {
+                    String desc[] = line.split("/by");
+                    list[i] = new Deadline(desc[0], desc[1]);
+                    System.out.println("____________________________________________________________\n" +
+                            "Got it. I've added this task: ");
+                    task_count++;
+                    System.out.println("[D][✗] " + list[i].description + "(by:" + desc[1] + ")");
+                    System.out.println("Now you have " + task_count + " tasks in the list.");
+                    System.out.println("____________________________________________________________\n");
+                    i++;
+                }catch(ArrayIndexOutOfBoundsException e){
+                    System.out.println("____________________________________________________________\n" +
+                            "☹ OOPS!!! The description of a deadline cannot be empty.");
+                    System.out.println("____________________________________________________________\n");
+                }
+            }else if(line.contains("event")){
+                try {
+                    String desc[] = line.split("/at");
+                    list[i] = new Deadline(desc[0], desc[1]);
+
+                    System.out.println("____________________________________________________________\n" +
+                            "Got it. I've added this task: ");
+                    task_count++;
+                    System.out.println("[E][✗] " + list[i].description + "(at:" + desc[1] + ")");
+                    System.out.println("Now you have " + task_count + " tasks in the list.");
+                    System.out.println("____________________________________________________________\n");
+                    i++;
+                }catch(ArrayIndexOutOfBoundsException e){
+                    System.out.println("____________________________________________________________\n" +
+                            "☹ OOPS!!! The description of an event cannot be empty.");
+                    System.out.println("____________________________________________________________\n");
+                }
+            }else if(line.contains("task")){
+                list[i] = new Task(line);
+                System.out.println("____________________________________________________________");
+                System.out.println("added: "+ line);
+                System.out.println("_____________________________________________________________");
+                i++;
+            }else{
+                System.out.println("____________________________________________________________");
+                System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ");
+                System.out.println("_____________________________________________________________");
+            }
+        }
+    }
+
+    public static void greeting(){
+        System.out.println("____________________________________________________________");
+        System.out.println("Hello! I'm Duke");
+        System.out.println("What can I do for you?");
+        System.out.println("____________________________________________________________");
+    }
+
+}
+
diff --git a/src/main/duke/task/Deadline.java b/src/main/duke/task/Deadline.java
new file mode 100644
index 0000000000..628685619c
--- /dev/null
+++ b/src/main/duke/task/Deadline.java
@@ -0,0 +1,15 @@
+package main.duke.task;
+public class Deadline extends Todo {
+    protected String by;
+
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+    public String getBy(){
+        return by;
+    }
+    public void setBy(String by){
+        this.by = by;
+    }
+}
\ No newline at end of file
diff --git a/src/main/duke/task/Event.java b/src/main/duke/task/Event.java
new file mode 100644
index 0000000000..3c80c2215d
--- /dev/null
+++ b/src/main/duke/task/Event.java
@@ -0,0 +1,15 @@
+package main.duke.task;
+public class Event extends Task {
+    protected String when;
+    public Event(String description, String when) {
+        super(description);
+        this.when = when;
+    }
+
+    public String getWhen(){
+        return when;
+    }
+    public void setWhen(String when){
+        this.when = when;
+    }
+}
diff --git a/src/main/duke/task/Task.java b/src/main/duke/task/Task.java
new file mode 100644
index 0000000000..d50e0fda9d
--- /dev/null
+++ b/src/main/duke/task/Task.java
@@ -0,0 +1,19 @@
+package main.duke.task;
+public class Task {
+    protected String description;
+    protected boolean isDone;
+    protected int listCount;
+
+
+    public Task(String description) {
+        this.description = description;
+        this.isDone = false;
+        this.listCount = 0;
+    }
+
+    public int length() {
+        return listCount; //return tick or X symbols
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/duke/task/Todo.java b/src/main/duke/task/Todo.java
new file mode 100644
index 0000000000..c3f7bb6ff9
--- /dev/null
+++ b/src/main/duke/task/Todo.java
@@ -0,0 +1,17 @@
+package main.duke.task;
+public class Todo extends Task {
+    protected boolean isDone;
+
+    public Todo(String description) {
+        super(description);
+        isDone = false;
+    }
+
+    public boolean isDone(){
+        return isDone;
+    }
+
+    public void setDone(boolean Done){
+        this.isDone = Done;
+    }
+}
diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class
new file mode 100644
index 0000000000..df69a60f7b
Binary files /dev/null and b/src/main/java/Deadline.class differ
diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
new file mode 100644
index 0000000000..0f4bb0801d
--- /dev/null
+++ b/src/main/java/Deadline.java
@@ -0,0 +1,15 @@
+
+public class Deadline extends Todo {
+    protected String by;
+
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+    public String getBy(){
+        return by;
+    }
+    public void setBy(String by){
+        this.by = by;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class
new file mode 100644
index 0000000000..92975b438a
Binary files /dev/null and b/src/main/java/Duke.class differ
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 5d313334cc..8dc8485a38 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -1,10 +1,105 @@
+//import java.util.Scanner;
+import java.util.*;
+import java.io.File;  // Import the File class
+import java.io.FileWriter;
+import java.io.IOException;  // Import the IOException class to handle errors
+
+import java.util.Scanner;
+
+//main class
 public class Duke {
+    public static String PATH = "C:\\Users\\HELIOS\\Downloads\\STUDY MATERIALS\\AY2021_SEM1\\CS2113\\Individualproject\\ip\\data\\duke.txt";
+    private static Storage storage = new Storage();
+    private static TaskList tasks = new TaskList();
+    private static Ui ui = new Ui();
+    private static Parser parser = new Parser();
+
+    public Duke() {
+    }
+
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
+        Ui.greeting();
+        tasks = storage.readFile(PATH);
+        request();
+    }
+
+    public static void request() {
+        Scanner in = new Scanner(System.in);
+        int i = tasks.task_count;
+
+        while(true) {
+            String status = "[✗] ";
+            String line = in.nextLine();
+            if (line.equals("bye")) {
+                ui.bye();
+                return;
+            }
+
+            if (line.equals("list")) {
+                System.out.println("____________________________________________________________\nHere are the tasks in your list: ");
+                if(tasks.returnList().isEmpty()) {
+                    System.out.println("There is currently nothing to do!");
+                }else{
+                    tasks.printList(i);
+                }
+            } else if (line.contains("done")) {
+                int num = Integer.parseInt(line.substring(5));
+                System.out.println(num);
+                tasks.markDone(num);
+            } else {
+                String[] desc;
+                if (parser.Contains(line, "todo")) {
+                    try {
+                        desc = line.split(" ");
+                        tasks.addTodo(desc, i);
+                        ++i;
+                    } catch (ArrayIndexOutOfBoundsException var10) {
+                        ui.oops("todo");
+                    }
+                } else if (parser.Contains(line, "deadline")) {
+                    try {
+                        desc = line.split("/by");
+                        tasks.addDeadline(desc, i);
+                        ++i;
+                    } catch (ArrayIndexOutOfBoundsException var9) {
+                        ui.oops("deadline");
+                    }
+                } else if (parser.Contains(line, "event")) {
+                    try {
+                        desc = line.split("/at");
+                        tasks.addEvent(desc, i);
+                        ++i;
+                    } catch (ArrayIndexOutOfBoundsException var8) {
+                        ui.oops("event");
+                    }
+                } else if (parser.Contains(line, "task")) {
+                    tasks.addTask(line, i);
+                    ++i;
+                } else if (parser.Contains(line, "delete")) {
+                    try {
+                        desc = line.split(" ");
+                        i = Integer.parseInt(desc[1]) - 1;
+                        tasks.delete(i);
+                        ++i;
+                    } catch (ArrayIndexOutOfBoundsException var7) {
+                        ui.oops("task");
+                    }
+                } else if (parser.Contains(line, "save")) {
+                    storage.writetofile(tasks.returnList(), i, PATH);
+                } else if (parser.Contains(line, "find")) {
+                    try {
+                        desc = line.split(" ");
+                        String description = desc[1];
+                        tasks.Find(description);
+                    } catch (ArrayIndexOutOfBoundsException var6) {
+                        ui.oops("find");
+                    }
+                } else {
+                    ui.dunno();
+                }
+            }
+        }
     }
 }
+
+
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
new file mode 100644
index 0000000000..4bfa2e8c2c
--- /dev/null
+++ b/src/main/java/Event.java
@@ -0,0 +1,14 @@
+public class Event extends Task {
+    protected String when;
+    public Event(String description, String when) {
+        super(description);
+        this.when = when;
+    }
+
+    public String getWhen(){
+        return when;
+    }
+    public void setWhen(String when){
+        this.when = when;
+    }
+}
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..9f37e4e0aa
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Duke
+
diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java
new file mode 100644
index 0000000000..eb17e5d58f
--- /dev/null
+++ b/src/main/java/Parser.java
@@ -0,0 +1,13 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+public class Parser {
+    public Parser() {
+    }
+
+    public boolean Contains(String line, String cmd) {
+        return line.contains(cmd);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java
new file mode 100644
index 0000000000..9a8b6278dd
--- /dev/null
+++ b/src/main/java/Storage.java
@@ -0,0 +1,116 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Scanner;
+
+public class Storage {
+    public Storage() {
+    }
+    /**
+     * write to file
+     * ...
+     */
+    public void writetofile(List<Task> list, int i, String filepath) {
+        try {
+            File myObj = new File(filepath);
+            if (myObj.createNewFile()) {
+                System.out.println("File created!");
+            } else {
+                System.out.println("File already exists.");
+            }
+            FileWriter myWriter = new FileWriter(filepath);
+
+            for(int j = 0; j < i; ++j) {
+                String timing = "";
+                Object var10000;
+                String classtype;
+                if (list.get(j) instanceof Deadline) {
+                    classtype = "[D]";
+                    var10000 = list.get(j);
+                    timing = "(by: " + ((Deadline)var10000).getBy() + ")";
+                } else if (list.get(j) instanceof Todo) {
+                    classtype = "[T]";
+                } else if (list.get(j) instanceof Event) {
+                    classtype = "[E]";
+                    var10000 = list.get(j);
+                    timing = "(at: " + ((Event)var10000).getWhen() + ")";
+                } else {
+                    classtype = "task";
+                }
+
+                if (((Task)list.get(j)).isDone) {
+                    myWriter.write(j + 1 + ". " + classtype + " [✓] " + ((Task)list.get(j)).description + " " + timing + "\n");
+                } else {
+                    myWriter.write(j + 1 + ". " + classtype + " [X] " + ((Task)list.get(j)).description + " " + timing + "\n");
+                }
+            }
+
+            myWriter.close();
+            System.out.println("Successfully saved to the file.");
+        } catch (IOException var8) {
+            System.out.println("An error occurred.");
+            var8.printStackTrace();
+        }
+
+    }
+
+    public File checkFileExists(String filePath) throws IOException {
+        File dataFile = new File(filePath);
+        if (!dataFile.exists()) {
+            dataFile.createNewFile();
+        }
+
+        return dataFile;
+    }
+    /**
+     * generate list from file
+     * ...
+     */
+    public TaskList readFile(String filepath) {
+        TaskList taskList = new TaskList();
+
+        try {
+            File dataFile = this.checkFileExists(filepath);
+            Scanner in = new Scanner(dataFile);
+            int i = 0;
+
+            while(in.hasNext()) {
+                String line = in.nextLine();
+                String[] taskDetails = line.split(" ");
+                String type = taskDetails[1];
+                line = String.join(" ", Arrays.copyOfRange(taskDetails, 3, taskDetails.length));
+                line = line.substring(0,line.length()-1);
+
+                System.out.println("Adding tasks from storage...");
+
+                switch(type) {
+                    case "[D]":
+                        taskList.addDeadline(line.split("\\(by:"), i);
+                        break;
+                    case "[E]":
+                        taskList.addEvent(line.split("\\(by:)"), i);
+                        break;
+                    case "[T]":
+                        taskList.addTodo(line.split(" "), i);
+                        break;
+                }
+
+                if (taskDetails[2].equals("[✓]")) {
+                    taskList.markDone(i);
+                }
+                i++;
+            }
+        } catch (IOException e) {
+        }
+
+        return taskList;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Task.class b/src/main/java/Task.class
new file mode 100644
index 0000000000..f4194190d7
Binary files /dev/null and b/src/main/java/Task.class differ
diff --git a/src/main/java/Task.java b/src/main/java/Task.java
new file mode 100644
index 0000000000..7cbfb4fc1e
--- /dev/null
+++ b/src/main/java/Task.java
@@ -0,0 +1,20 @@
+public class Task {
+    protected String description;
+    protected boolean isDone;
+    protected int listCount;
+
+
+    public Task(String description) {
+        this.description = description;
+        this.isDone = false;
+        this.listCount = 0;
+    }
+
+    public int length() {
+        return listCount; //return tick or X symbols
+    }
+    public void markAsDone(){
+        this.isDone = true;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java
new file mode 100644
index 0000000000..f1531bd695
--- /dev/null
+++ b/src/main/java/TaskList.java
@@ -0,0 +1,185 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import java.util.*;
+
+public class TaskList {
+    public static List<Task> list;
+    public static int task_count;
+
+    //tasks init
+    public TaskList() {
+        list = new ArrayList();
+        task_count = 0;
+    }
+
+    public TaskList(List<Task> list) {
+        TaskList.list = list;
+        task_count = list.size();
+    }
+
+    /**
+     * print list values based on integer i
+     * ...
+     */
+    public void printList(int i) {
+        for(int j = 0; j < i; ++j) {
+            String timing = "";
+            String classtype;
+            if (list.get(j) instanceof Deadline) {
+                classtype = "[D]";
+                timing = "(by: " + ((Deadline)list.get(j)).getBy() + ")";
+            } else if (list.get(j) instanceof Todo) {
+                classtype = "[T]";
+            } else if (list.get(j) instanceof Event) {
+                classtype = "[E]";
+                timing = "(at: " + ((Event)list.get(j)).getWhen() + ")";
+            } else {
+                classtype = "[T]";
+            }
+
+            if (((Task)list.get(j)).isDone) {
+                System.out.println(j + 1 + ". " + classtype + "[✓]" + ((Task)list.get(j)).description + timing);
+            } else {
+                System.out.println(j + 1 + ". " + classtype + "[✗] " + ((Task)list.get(j)).description + timing);
+            }
+        }
+
+    }
+
+    /**
+     * print list values based on list
+     * ...
+     */
+    public static void printList(List<Task> list) {
+        for(int j=0;j<list.size();j++){
+            String classtype;
+            String timing = "";
+            if(list.get(j) instanceof Deadline){
+                classtype = "[D]";
+                timing = "(by: "+((Deadline) list.get(j)).getBy()+")";
+            }
+            else if(list.get(j) instanceof Todo){
+                classtype = "[T]";
+            }
+            else if(list.get(j) instanceof Event){
+                classtype = "[E]";
+                timing = "(at: "+((Event) list.get(j)).getWhen()+")";
+            }
+            else{
+                classtype = "[T]";
+            }
+            if(list.get(j).isDone){
+                System.out.println((j+1)+ ". "+ classtype + "[✓]" + list.get(j).description + timing);
+            }//not done
+            else {
+                System.out.println((j + 1) + ". " +classtype+ "[✗] " + list.get(j).description + timing);
+            }
+        }
+
+    }
+
+    /**
+     * mark as done
+     * ...
+     */
+    public void markDone(int num) {
+        ((Task)list.get(num - 1)).isDone = true;
+        System.out.println("____________________________________________________________\nNice! I've marked this task as done:");
+        System.out.println("[✓] " + ((Task)list.get(num - 1)).description + "\n____________________________________________________________\n");
+    }
+
+    /**
+     * add task types to list
+     * ...
+     */
+    public static void addTodo(String[] desc, int i) {
+        list.add(i, new Todo(desc[1]));
+        System.out.println("____________________________________________________________\nGot it. I've added this task: ");
+        task_count++;
+        System.out.println("[T][✗] " + ((Task)list.get(i)).description);
+        System.out.println("Now you have " + task_count + " tasks in the list.");
+        System.out.println("____________________________________________________________\n");
+    }
+
+    public static void addDeadline(String[] desc, int i) {
+        list.add(i, new Deadline(desc[0], desc[1]));
+        System.out.println("____________________________________________________________\nGot it. I've added this task: ");
+        task_count++;
+        System.out.println("[D][✗] " + ((Task)list.get(i)).description + "(by:" + desc[1] + ")");
+        System.out.println("Now you have " + task_count + " tasks in the list.");
+        System.out.println("____________________________________________________________\n");
+    }
+
+    public static void addEvent(String[] desc, int i) {
+        list.add(i, new Event(desc[0], desc[1]));
+        System.out.println("____________________________________________________________\nGot it. I've added this task: ");
+        task_count++;
+        System.out.println("[E][✗] " + ((Task)list.get(i)).description + "(at:" + desc[1] + ")");
+        System.out.println("Now you have " + task_count + " tasks in the list.");
+        System.out.println("____________________________________________________________\n");
+    }
+
+    public void addTask(String line, int i) {
+        list.add(i, new Task(line));
+        System.out.println("____________________________________________________________");
+        System.out.println("added: " + line);
+        System.out.println("_____________________________________________________________");
+    }
+
+    /**
+     * delete task
+     * ...
+     */
+    public void delete(int i) {
+        String timing = "";
+        String classtype;
+        if (list.get(i) instanceof Deadline) {
+            classtype = "[D]";
+            timing = "(by: " + ((Deadline)list.get(i)).getBy() + ")";
+        } else if (list.get(i) instanceof Todo) {
+            classtype = "[T]";
+        } else if (list.get(i) instanceof Event) {
+            classtype = "[E]";
+            timing = "(at: " + ((Event)list.get(i)).getWhen() + ")";
+        } else {
+            classtype = "[T]";
+        }
+
+        System.out.println("____________________________________________________________\nNoted. I've removed this task: ");
+        if (((Task)list.get(i)).isDone) {
+            System.out.println(i + 1 + ". " + classtype + "[✓]" + ((Task)list.get(i)).description + timing);
+        } else {
+            System.out.println(i + 1 + ". " + classtype + "[✗] " + ((Task)list.get(i)).description + timing);
+        }
+
+        --task_count;
+        list.remove(list.get(i));
+        System.out.println("Now you have " + task_count + " tasks in the list.");
+        System.out.println("____________________________________________________________\n");
+    }
+
+    public List<Task> returnList() {
+        return list;
+    }
+
+    /**
+     * find matching tasks in list
+     *
+     */
+    public static void Find(String description) {
+        List<Task> returnList = new ArrayList();
+        System.out.println(" Here are the matching tasks in your list: ");
+
+        for(int i = 0; i < list.size(); ++i) {
+            Task task = (Task)list.get(i);
+            if (task.description.contains(description)) {
+                returnList.add(i, (Task)list.get(i));
+            }
+        }
+
+        printList(returnList);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class
new file mode 100644
index 0000000000..bf38274315
Binary files /dev/null and b/src/main/java/Todo.class differ
diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java
new file mode 100644
index 0000000000..30c8f69109
--- /dev/null
+++ b/src/main/java/Todo.java
@@ -0,0 +1,16 @@
+public class Todo extends Task {
+    protected boolean isDone;
+
+    public Todo(String description) {
+        super(description);
+        isDone = false;
+    }
+
+    public boolean isDone(){
+        return isDone;
+    }
+
+    public void setDone(boolean Done){
+        this.isDone = Done;
+    }
+}
diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java
new file mode 100644
index 0000000000..ef3a5e033b
--- /dev/null
+++ b/src/main/java/Ui.java
@@ -0,0 +1,47 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+public class Ui {
+    public Ui() {
+    }
+    /**
+     * bye msg
+     * ...
+     */
+    public void bye() {
+        System.out.println("____________________________________________________________\nBye. Hope to see you again soon!\n____________________________________________________________\n");
+    }
+
+    /**
+     * error message
+     * ...
+     */
+    public void oops(String desc) {
+        System.out.println("____________________________________________________________\n☹ OOPS!!! The description of a " + desc + " cannot be empty.");
+        System.out.println("____________________________________________________________\n");
+    }
+
+    /**
+     * error message 2
+     * ...
+     */
+    public void dunno() {
+        System.out.println("____________________________________________________________");
+        System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ");
+        System.out.println("_____________________________________________________________");
+    }
+
+    /**
+     * greeting message
+     *
+     * ...
+     */
+    public static void greeting() {
+        System.out.println("____________________________________________________________");
+        System.out.println("Hello! I'm Duke");
+        System.out.println("What can I do for you?");
+        System.out.println("____________________________________________________________");
+    }
+}