diff --git a/README.md b/README.md
index 9d95025bce..42c84f46ba 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,23 @@
-# 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.
-
-## Setting up in Intellij
-
-Prerequisites: JDK 11, update Intellij to the most recent version.
-
-1. Open Intellij (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project dialog first)
-1. Set up the correct JDK version, as follows:
-   1. Click `Configure` > `Structure for New Projects` and then `Project Settings` > `Project` > `Project SDK`
-   1. If JDK 11 is listed in the drop down, select it. If it is not, click `New...` and select the directory where you installed JDK 11
-   1. Click `OK`
-1. Import the project into Intellij as follows:
-   1. Click `Open or Import`.
-   1. Select the project directory, and click `OK`
-   1. If there are any further prompts, accept the defaults.
-1. After the importing is complete, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
-   ```
-   Hello from
-    ____        _        
-   |  _ \ _   _| | _____ 
-   | | | | | | | |/ / _ \
-   | |_| | |_| |   <  __/
-   |____/ \__,_|_|\_\___|
-   ```
+# Your life Asistant Chat Bot - KK
+
+This is a chatbot that can help you keep track of your to do list. It's named is KK. Given below are instructions on how to use it. 
+      _      _
+| | / /| | / /
+| |/ / | |/ /
+|   <  |   <
+|_|\_\ |_|\_\
+
+
+## Sample commands include: 
+
+**list** This shows the list of things you have added
+
+**event** <content> /at <time> This adds an event at the stipulated time
+
+**deadline** <content> /by <time> This adds a deadline by the stipulated time
+
+**todo** <content> This adds a todo to the bot
+
+**done** <index> This marks the thing at index index as completed
+
+**delete** <index> This deletes the thing at index index
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..e0a1fbcae7
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,63 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'checkstyle'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    String javaFxVersion = '11'
+
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+}
+
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+
+        showExceptions true
+        exceptionFormat "full"
+        showCauses true
+        showStackTraces true
+        showStandardStreams = false
+    }
+}
+
+application {
+    mainClassName = "duke.Launcher"
+}
+
+version = '0.2'
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveClassifier = null
+}
+
+checkstyle {
+    toolVersion = '8.29'
+}
+
+run{
+    standardInput = System.in
+}
\ No newline at end of file
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000000..7951f3a6c4
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file enforces rules for a modified version of the module's code standard at
+    https://oss-generic.github.io/process/codingstandards/coding-standards-java.html
+-->
+
+<module name="Checker">
+
+    <module name="FileTabCharacter">
+        <!-- Checks that there are no tab characters in the file. -->
+    </module>
+
+    <module name="NewlineAtEndOfFile">
+        <!-- Accept LF, CR or CRLF to accomodate devs who prefer different line endings -->
+        <property name="lineSeparator" value="lf_cr_crlf"/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that FIXME is not used in comments.  TODO is preferred. -->
+        <property name="format" value="((//.*)|(\*.*))FIXME" />
+        <property name="message" value='TODO is preferred to FIXME."' />
+    </module>
+
+    <module name="SuppressionFilter">
+        <property name="file" value="${config_loc}/suppressions.xml"/>
+    </module>
+
+    <module name="LineLength">
+        <!-- Checks if a line is too long. -->
+        <property name="max" value="120"/>
+    </module>
+
+    <!-- All Java AST specific tests live under TreeWalker module. -->
+    <module name="TreeWalker">
+
+        <!-- Required to allow exceptions in code style -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
+
+        <!--
+        IMPORT CHECKS
+        -->
+
+        <!-- Checks the ordering of import statements follow the rules that the default Eclipse formatter uses.
+        The order rule "STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE" consists of:
+          1. STATIC: static imports
+          2. STANDARD_JAVA_PACKAGE: standard java/javax imports
+          3. SPECIAL_IMPORTS: defined as org imports
+          4. THIRD_PARTY_PACKAGE: defined as com imports
+        -->
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules"
+                      value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+            <property name="specialImportsRegExp" value="^org\."/>
+            <property name="thirdPartyPackageRegExp" value="^com\."/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+        </module>
+
+        <!-- Checks for redundant import statements.
+        An import statement is redundant if:
+          * It is a duplicate of another import. This is, when a class is imported more than once.
+          * The class non-statically imported is from the java.lang package, e.g. importing java.lang.String.
+          * The class non-statically imported is from the same package as the current package.
+        -->
+        <module name="RedundantImport"/>
+
+        <!-- Checks for unused import statements.
+        An import statement is unused if:
+          It's not referenced in the file.
+        -->
+        <module name="UnusedImports"/>
+
+        <module name="AvoidStarImport"/>
+
+        <!--
+        NAMING CHECKS
+        -->
+
+        <!-- Validate abbreviations (consecutive capital letters) length in identifier name -->
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="1"/>
+        </module>
+
+        <module name="PackageName">
+            <!-- Validates identifiers for package names against the supplied expression. -->
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="TypeName">
+            <!-- Validates static, final fields against the expression "^[A-Z][a-zA-Z0-9]*$". -->
+            <metadata name="altname" value="TypeName"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ConstantName">
+            <!-- Validates non-private, static, final fields against the expression "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+            <metadata name="altname" value="ConstantName"/>
+            <property name="applyToPrivate" value="false"/>
+            <message key="name.invalidPattern"
+                     value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="StaticVariableName">
+            <!-- Validates static, non-final fields against the supplied expression. -->
+            <metadata name="altname" value="StaticVariableName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MemberName">
+            <!-- Validates non-static members against the supplied expression. -->
+            <metadata name="altname" value="MemberName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MethodName">
+            <!-- Validates identifiers for method names against the supplied expression. -->
+            <metadata name="altname" value="MethodName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-z][a-zA-Z0-9]+){0,2}$"/>
+        </module>
+
+        <module name="ParameterName">
+            <!-- Validates identifiers for method parameters against the expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalFinalVariableName">
+            <!-- Validates identifiers for local final variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalVariableName">
+            <!-- Validates identifiers for local variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+
+        <!--
+        LENGTH and CODING CHECKS
+        -->
+
+        <!-- Checks that array type declarations follow Java Style
+          Java style: public static void main(String[] args) // Allowed
+          C style:    public static void main(String args[]) // Not allowed
+        -->
+        <module name="ArrayTypeStyle"/>
+
+        <!-- Checks if a catch block is empty and does not contain any comments. -->
+        <module name="EmptyCatchBlock"/>
+
+        <module name="LeftCurly">
+            <!-- Checks for placement of the left curly brace ('{'). -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="RightCurly">
+            <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+            the same line. e.g., the following example is fine:
+            <pre>
+              if {
+                ...
+              } else
+            </pre>
+            -->
+            <!-- This next example is not fine:
+            <pre>
+              if {
+                ...
+              }
+              else
+            </pre>
+            -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!-- Checks for braces around loop blocks -->
+        <module name="NeedBraces">
+            <!--
+            if (true) return 1; // Not allowed
+            if (true) { return 1; } // Not allowed
+            else if {
+              return 1; // else if should always be multi line
+            }
+            if (true)
+              return 1; // Not allowed
+            -->
+            <property name="allowEmptyLoopBody" value="true"/>
+        </module>
+
+        <!-- Checks that each variable declaration is in its own statement and on its own line. -->
+        <module name="MultipleVariableDeclarations"/>
+
+        <module name="OneStatementPerLine"/>
+
+        <!-- Checks that long constants are defined with an upper ell.-->
+        <module name="UpperEll" />
+
+        <module name="FallThrough">
+            <!-- Warn about falling through to the next case statement.  Similar to
+            javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+            on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+            some other variants which we don't publicized to promote consistency).
+            -->
+            <property name="reliefPattern"
+                      value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+        </module>
+
+        <module name="MissingSwitchDefault"/>
+
+        <!-- Checks that Class variables should never be declared public. -->
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+            <property name="allowPublicFinalFields" value="true"/>
+            <property name="ignoreAnnotationCanonicalNames" value="RegisterExtension, TempDir"/>
+        </module>
+
+        <!--
+        ORDER CHECKS
+        -->
+
+        <!-- Checks that the order of at-clauses follows the tagOrder default property value order.
+             @author, @version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated
+        -->
+        <module name="AtclauseOrder"/>
+
+        <!-- Checks if the Class and Interface declarations is organized in this order
+          1. Class (static) variables. Order: public, protected, package level (no access modifier), private.
+          2. Instance variables. Order: public, protected, package level (no access modifier), private.
+          3. Constructors
+          4. Methods
+        -->
+        <module name ="DeclarationOrder"/>
+
+        <module name="ModifierOrder">
+            <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+                 8.4.3.  The prescribed order is:
+                 public, protected, private, abstract, static, final, transient, volatile,
+                 synchronized, native, strictfp
+              -->
+        </module>
+
+        <module name="OverloadMethodsDeclarationOrder"/>
+
+        <!--
+        WHITESPACE CHECKS
+        -->
+
+        <!-- Checks that comments are indented relative to their position in the code -->
+        <module name="CommentsIndentation"/>
+
+        <module name="WhitespaceAround">
+            <!-- Checks that various tokens are surrounded by whitespace.
+                 This includes most binary operators and keywords followed
+                 by regular or curly braces.
+            -->
+            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        RCURLY, SL, SLIST, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+            <!-- Allow empty constructors e.g. MyClass() {} -->
+            <property name="allowEmptyConstructors" value="true" />
+            <!-- Allow empty methods e.g. void func() {} -->
+            <property name="allowEmptyMethods" value="true" />
+            <!-- Allow empty types e.g. class Foo {}, enum Foo {} -->
+            <property name="allowEmptyTypes" value="true" />
+            <!-- Allow empty loops e.g. for (int i = 1; i > 1; i++) {} -->
+            <property name="allowEmptyLoops" value="true" />
+            <!-- Allow empty lambdas e.g. () -> {} -->
+            <property name="allowEmptyLambdas" value="true" />
+        </module>
+
+        <module name="WhitespaceAfter">
+            <!-- Checks that commas, semicolons and typecasts are followed by whitespace. -->
+            <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+        </module>
+
+        <module name="NoWhitespaceAfter">
+            <!-- Checks that there is no whitespace after various unary operators. Linebreaks are allowed. -->
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+
+        <!-- No trailing whitespace -->
+        <module name="Regexp">
+            <property name="format" value="[ \t]+$"/>
+            <property name="illegalPattern" value="true"/>
+            <property name="message" value="Trailing whitespace"/>
+        </module>
+
+        <module name="OperatorWrap">
+            <!-- Checks that the non-assignment type operator is at the next line in a line wrap.
+                 This includes "?", ":", "==", "!=", "/", "+", "-", "*", "%", ">>", ">>>",
+                 ">=", ">", "<<", "<=", "<", "^", "|", "||", "&", "&&", "instanceof",
+                 "&" when used in a generic upper or lower bounds constraints,
+                   e.g. <T extends Foo & Bar>
+                 "::" when used as a reference to a method or constructor without arguments.
+                   e.g. String::compareToIgnoreCase
+            -->
+            <property name="tokens" value="QUESTION, COLON, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD, SR, BSR,
+        GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, LITERAL_INSTANCEOF, TYPE_EXTENSION_AND, METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="OperatorWrap">
+            <!-- Checks that the assignment type operator is at the previous end of line in a line wrap.
+                 This includes "=", "/=", "+=", "-=", "*=", "%=", ">>=", ">>>=", "<<=", "^=", "&=".
+            -->
+            <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN,
+        SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+            <property name="option" value="eol"/>
+        </module>
+
+        <module name="SeparatorWrap">
+            <!-- Checks that the ".", "@" is at the next line in a line wrap. -->
+            <property name="tokens" value="DOT, AT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- Checks that the ",", "]", "[", "...", ";", "(" is at the previous end of line in a line wrap. -->
+            <property name="tokens" value="COMMA, RBRACK, ARRAY_DECLARATOR, ELLIPSIS, SEMI, LPAREN"/>
+            <property name="option" value="eol"/>
+        </module>
+
+        <module name="Indentation">
+            <property name="caseIndent" value="0" />
+        </module>
+
+        <module name="NoWhitespaceBefore">
+            <!-- Checks that there is no whitespace before various unary operators. Linebreaks are allowed. -->
+            <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+
+        <module name="ParenPad">
+            <!-- Checks that there is no whitespace before close parenthesis or after open parenthesis. -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!-- Checks that non-whitespace characters are separated by no more than one whitespace character.
+             a = 1; // Allowed
+             a  = 1; // Not allowed (more than one space before =)
+        -->
+        <module name="SingleSpaceSeparator">
+            <!-- Validate whitespace surrounding comments as well.
+                 a = 1; // Allowed (single space before start of comment)
+                 a = 1; /* Allowed (single space before start of comment) */
+                 /* Allowed (single space after end of comment) */ a = 1;
+                 a = 1;  // Not allowed (more than one space before start of comment)
+                 a = 1;  /* Not allowed (more than one space before start of comment) */
+                 /* Not allowed (more than one space after end of comment) */  a = 1;
+                 This doesn't validate whitespace within comments so a comment /* like  this */ is allowed.
+            -->
+            <property name="validateComments" value="true"/>
+        </module>
+
+        <!--
+        JAVADOC CHECKS
+        -->
+
+        <!-- Checks that every class, enumeration and interface have a header comment. -->
+        <module name="JavadocType">
+            <property name="allowMissingParamTags" value="true"/>
+        </module>
+
+        <!-- Checks that every public method (excluding getters, setters and constructors) has a header comment. -->
+        <module name="JavadocMethod">
+            <property name="allowedAnnotations" value="Override, Test, BeforeAll, BeforeEach, AfterAll, AfterEach, Subscribe"/>
+            <property name="scope" value="public"/>
+            <property name="validateThrows" value="false"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
+        </module>
+
+        <module name="InvalidJavadocPosition"/>
+
+        <module name="MissingJavadocMethodCheck">
+            <property name="minLineCount" value="1"/>
+            <property name="allowMissingPropertyJavadoc" value="true"/>
+            <property name="ignoreMethodNamesRegex" value="(set.*|get.*)"/>
+        </module>
+
+    </module>
+</module>
\ No newline at end of file
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
new file mode 100644
index 0000000000..135ea49ee0
--- /dev/null
+++ b/config/checkstyle/suppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+    <suppress checks="JavadocType" files=".*Test\.java"/>
+    <suppress checks="MissingJavadocMethodCheck" files=".*Test\.java"/>
+</suppressions>
\ No newline at end of file
diff --git a/data/kk.txt b/data/kk.txt
new file mode 100644
index 0000000000..9c81e21739
--- /dev/null
+++ b/data/kk.txt
@@ -0,0 +1,5 @@
+T | 0 | sasa
+E | 0 | sasa | tonight
+D | 0 | sasas | 12/12/2020 17:22
+E | 0 | sasa | sas
+T | 0 | sasa
diff --git a/docs/README.md b/docs/README.md
index fd44069597..9dec9ec30c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,20 +1,19 @@
-# User Guide
+# Your life Asistant Chat Bot - KK
 
-## Features 
+This is a chatbot that can help you keep track of your to do list. It's named is KK. Given below are instructions on how to use it. 
+      
 
-### Feature 1 
-Description of feature.
+## Sample commands include: 
 
-## Usage
+**list** This shows the list of things you have added
 
-### `Keyword` - Describe action
+**event** <content> /at <time> This adds an event at the stipulated time
 
-Describe action and its outcome.
+**deadline** <content> /by <date and time> This adds a deadline by the stipulated date time. 
+date should be in the format of d/MM/yyyy time is in the format of HH:mm eg: 27/12/2020 16:40
 
-Example of usage: 
+**todo** <content> This adds a todo to the bot
 
-`keyword (optional arguments)`
+**done** <index> This marks the thing at index index as completed
 
-Expected outcome:
-
-`outcome`
+**delete** <index> This deletes the thing at index index
\ No newline at end of file
diff --git a/docs/Ui.png b/docs/Ui.png
new file mode 100644
index 0000000000..cd3011e147
Binary files /dev/null and b/docs/Ui.png differ
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 0000000000..b849713594
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-leap-day
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..f3d88b1c2f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..f175830922
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Sep 16 23:45:38 SGT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..2fe81a7d95
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..62bd9b9cce
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,103 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
deleted file mode 100644
index 5d313334cc..0000000000
--- a/src/main/java/Duke.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class Duke {
-    public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
-    }
-}
diff --git a/src/main/java/duke/KK.java b/src/main/java/duke/KK.java
new file mode 100644
index 0000000000..af3031ece8
--- /dev/null
+++ b/src/main/java/duke/KK.java
@@ -0,0 +1,55 @@
+package duke;
+
+import duke.command.Command;
+import duke.exceptions.DukeException;
+import duke.task.TaskList;
+import duke.utils.Parser;
+import duke.utils.Ui;
+
+/**
+ * Represents a chat bot call duke.KK.
+ */
+public class KK {
+
+    private TaskList tasks;
+    private Ui ui;
+
+    /**
+     * Constructor for KK class.
+     */
+    public KK(String path, String fileName) {
+        ui = new Ui();
+        tasks = new TaskList(path, fileName);
+    }
+
+    /**
+     * The chat bot starts running and interact with user.
+     */
+    public void run() {
+        ui.showWelcome();
+        relp();
+        ui.sayGoodBye();
+    }
+
+    private void relp() {
+        boolean isExit = false;
+        while (!isExit) {
+            try {
+                String fullCommand = ui.readCommand();
+                ui.showLine(); // show the divider line ("_______")
+                Command c = Parser.parse(fullCommand);
+                c.execute(tasks, ui);
+                isExit = c.isExit();
+            } catch (DukeException e) {
+                ui.showError(e.getMessage());
+            } finally {
+                ui.showLine();
+            }
+        }
+    }
+
+    public String getResponse(String command) throws DukeException {
+        Command c = Parser.parse(command);
+        return c.execute(tasks, ui);
+    }
+}
diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java
new file mode 100644
index 0000000000..9acb9f8605
--- /dev/null
+++ b/src/main/java/duke/Launcher.java
@@ -0,0 +1,13 @@
+package duke;
+
+import duke.ui.Main;
+import javafx.application.Application;
+
+/**
+ * A launcher class to workaround classpath issues.
+ */
+public class Launcher {
+    public static void main(String[] args) {
+        Application.launch(Main.class, args);
+    }
+}
diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java
new file mode 100644
index 0000000000..e361e30a0e
--- /dev/null
+++ b/src/main/java/duke/command/AddCommand.java
@@ -0,0 +1,66 @@
+package duke.command;
+
+import duke.exceptions.DukeException;
+import duke.task.Deadline;
+import duke.task.Event;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.task.ToDo;
+import duke.utils.Ui;
+
+/**
+ * Represents command that add a task to the duke.KK's task list upon execution
+ */
+
+public class AddCommand extends Command {
+    private String taskType;
+    private String info;
+
+    /**
+     * Constructor for AddCommand class
+     */
+    public AddCommand(String taskType, String info) {
+        this.taskType = taskType;
+        this.info = info;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    /**
+     * Adds new task to the tasks provided and shows add message through ui.
+     *
+     * @param tasks  a TaskList object which contains a list of task
+     * @param ui a UI object which can prints message to console
+     */
+    @Override
+    public String execute(TaskList tasks, Ui ui) throws DukeException {
+
+        Task task;
+
+        if (taskType.equals("todo")) {
+            task = new ToDo(info);
+        } else if (taskType.equals("deadline")) {
+            try {
+                String[] deadlineParts = info.split(" /by ");
+                task = new Deadline(deadlineParts[0], deadlineParts[1]);
+            } catch (Exception e ) {
+                throw new DukeException("invalid deadline command format");
+            }
+        } else { // event
+            try {
+                String[] eventParts = info.split(" /at ");
+                task = new Event(eventParts[0], eventParts[1]);
+            } catch (Exception e ) {
+                throw new DukeException("invalid event command format");
+            }
+        }
+
+        tasks.addTask(task);
+        return ui.showAddMessage(task, tasks);
+
+    }
+
+}
diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java
new file mode 100644
index 0000000000..3b2b16c28f
--- /dev/null
+++ b/src/main/java/duke/command/Command.java
@@ -0,0 +1,10 @@
+package duke.command;
+
+import duke.exceptions.DukeException;
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+public abstract class Command {
+    public abstract boolean isExit();
+    public abstract String execute(TaskList tasks, Ui ui) throws DukeException;
+}
diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java
new file mode 100644
index 0000000000..6891423f0c
--- /dev/null
+++ b/src/main/java/duke/command/DeleteCommand.java
@@ -0,0 +1,41 @@
+package duke.command;
+
+import duke.exceptions.DukeException;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+/**
+ * Represents command that delete a task from the duke.KK's task list upon execution
+ */
+
+public class DeleteCommand extends Command {
+
+    private int index;
+
+    public DeleteCommand(int index) {
+        this.index = index;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    /**
+     * Deletes a task from the tasks provided and show removal message through ui.
+     *
+     * @param tasks  a TaskList object which contains a list of task
+     * @param ui a UI object which can prints message to console
+     */
+    @Override
+    public String execute(TaskList tasks, Ui ui) throws DukeException {
+        try {
+            Task task = tasks.get(index);
+            tasks.remove(index);
+            return ui.showRemovalMessage(task, tasks);
+        } catch (Exception e) {
+            throw new DukeException("invalid index");
+        }
+    }
+}
diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java
new file mode 100644
index 0000000000..4d6b26f466
--- /dev/null
+++ b/src/main/java/duke/command/DoneCommand.java
@@ -0,0 +1,38 @@
+package duke.command;
+
+import duke.exceptions.DukeException;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+/**
+ * Represents command that change a task status to done in the duke.KK's task list upon execution
+ */
+public class DoneCommand extends Command {
+    private int index;
+    public DoneCommand(int index) {
+        this.index = index;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    /**
+     * Changes a task status from the tasks provided to done and show done message through ui.
+     *
+     * @param tasks  a TaskList object which contains a list of task
+     * @param ui a UI object which can prints message to console
+     */
+    @Override
+    public String execute(TaskList tasks, Ui ui) throws DukeException {
+        try {
+            Task task = tasks.get(index);
+            tasks.markAsDone(index);
+            return ui.showDoneMessage(task);
+        } catch (Exception e) {
+            throw new DukeException("invalid index");
+        }
+    }
+}
diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java
new file mode 100644
index 0000000000..bd5349a90e
--- /dev/null
+++ b/src/main/java/duke/command/ExitCommand.java
@@ -0,0 +1,19 @@
+package duke.command;
+
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+/**
+ * Represents command that stops the duke.KK from running upon execution.
+        */
+public class ExitCommand extends Command {
+    @Override
+    public boolean isExit() {
+        return true;
+    }
+
+    @Override
+    public String execute(TaskList tasks, Ui ui) {
+        return "you can just close this window~";
+    }
+}
diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java
new file mode 100644
index 0000000000..26e1147c65
--- /dev/null
+++ b/src/main/java/duke/command/FindCommand.java
@@ -0,0 +1,22 @@
+package duke.command;
+
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+public class FindCommand extends Command {
+
+    private String searchText;
+    public FindCommand(String searchText) {
+        this.searchText = searchText;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    @Override
+    public String execute(TaskList tasks, Ui ui) {
+        return ui.showListMessage(tasks.find(searchText));
+    }
+}
diff --git a/src/main/java/duke/command/HelpCommand.java b/src/main/java/duke/command/HelpCommand.java
new file mode 100644
index 0000000000..6942353f73
--- /dev/null
+++ b/src/main/java/duke/command/HelpCommand.java
@@ -0,0 +1,26 @@
+package duke.command;
+
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+/**
+ * Represents command that displays current task list in duke.KK upon execution.
+ */
+public class HelpCommand extends Command {
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    /**
+     * Uses ui to display the tasks info.
+     *
+     * @param tasks  a TaskList object which contains a list of task
+     * @param ui a UI object which can prints message to console
+     */
+    @Override
+    public String execute(TaskList tasks, Ui ui) {
+        return ui.helpMessage();
+    }
+}
diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java
new file mode 100644
index 0000000000..d104dd01eb
--- /dev/null
+++ b/src/main/java/duke/command/ListCommand.java
@@ -0,0 +1,26 @@
+package duke.command;
+
+import duke.task.TaskList;
+import duke.utils.Ui;
+
+/**
+ * Represents command that displays current task list in duke.KK upon execution.
+ */
+public class ListCommand extends Command {
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    /**
+     * Uses ui to display the tasks info.
+     *
+     * @param tasks  a TaskList object which contains a list of task
+     * @param ui a UI object which can prints message to console
+     */
+    @Override
+    public String execute(TaskList tasks, Ui ui) {
+        return ui.showListMessage(tasks);
+    }
+}
diff --git a/src/main/java/duke/exceptions/DukeException.java b/src/main/java/duke/exceptions/DukeException.java
new file mode 100644
index 0000000000..aaca09bbf9
--- /dev/null
+++ b/src/main/java/duke/exceptions/DukeException.java
@@ -0,0 +1,7 @@
+package duke.exceptions;
+
+public class DukeException extends Exception {
+    public DukeException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
new file mode 100644
index 0000000000..64daf00cfc
--- /dev/null
+++ b/src/main/java/duke/task/Deadline.java
@@ -0,0 +1,63 @@
+package duke.task;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import duke.exceptions.DukeException;
+
+/**
+ * Represents a Deadline Task.
+ */
+public class Deadline extends Task {
+
+    private String time;
+    private LocalDate date;
+    private LocalDateTime dateTime;
+
+    /**
+     * Constructor for a Deadline Task.
+     */
+    public Deadline(String description, String time) throws DukeException {
+        super(description);
+        try {
+            this.time = time;
+            String[] parts = time.split(" ");
+            String[] timeParts = parts[1].split(":");
+            int hour = Integer.parseInt(timeParts[0]);
+            int minute = Integer.parseInt(timeParts[1]);
+            date = LocalDate.parse(parts[0], DateTimeFormatter.ofPattern("d/MM/yyyy"));
+            dateTime = date.atTime(hour, minute);
+        } catch (Exception e) {
+            throw new DukeException("invalid datetime format, you should use d/MM/yyyy HH:mm. eg:22/12/2020 15:22");
+        }
+    }
+
+    /**
+     * Constructor for a Deadline Task.
+     */
+    public Deadline(boolean isDone, String description, String time) {
+        super(isDone, description);
+        this.time = time;
+        String[] parts = time.split(" ");
+        String[] timeParts = parts[1].split(":");
+        int hour = Integer.parseInt(timeParts[0]);
+        int minute = Integer.parseInt(timeParts[1]);
+        date = LocalDate.parse(parts[0], DateTimeFormatter.ofPattern("d/MM/yyyy"));
+        dateTime = date.atTime(hour, minute);
+    }
+
+    @Override
+    public String toString() {
+        return "[D]" + super.toString() + " (by: "
+                + dateTime.format(DateTimeFormatter.ofPattern("MMM d yyyy, HH:mm")) + ")";
+    }
+
+    @Override
+    public String toStoreFormat() {
+        String type = "D";
+        String status = super.isDone ? "1" : "0";
+        String connect = " | ";
+        return type + connect + status + connect + description + connect + time;
+    }
+}
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
new file mode 100644
index 0000000000..73f326efbf
--- /dev/null
+++ b/src/main/java/duke/task/Event.java
@@ -0,0 +1,38 @@
+package duke.task;
+
+/**
+ * Represents a Event Task.
+ */
+public class Event extends Task {
+    private String time;
+
+    /**
+     * Constructor for an Event Task.
+     */
+    public Event(String description, String time) {
+        super(description);
+        this.time = time;
+    }
+
+    /**
+     * Constructor for an Event Task.
+     */
+    public Event(boolean isDone, String description, String time) {
+        super(isDone, description);
+        this.time = time;
+    }
+
+    @Override
+    public String toString() {
+        return "[E]" + super.toString() + "(at: " + time + ")";
+    }
+
+    @Override
+    public String toStoreFormat() {
+        String type = "E";
+        String status = super.isDone ? "1" : "0";
+        String connect = " | ";
+        return type + connect + status + connect + description + connect + time;
+    }
+
+}
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
new file mode 100644
index 0000000000..190cfca326
--- /dev/null
+++ b/src/main/java/duke/task/Task.java
@@ -0,0 +1,45 @@
+package duke.task;
+
+/**
+ * Represents a Task which have 3 child class: ToDo, Event and Deadline.
+ */
+public class Task {
+    protected boolean isDone;
+    protected String description;
+
+    /**
+     * Constructor for Task
+     */
+    public Task(String description) {
+        this.isDone = false;
+        this.description = description;
+    }
+
+    /**
+     * Constructor for Task
+     */
+    public Task(boolean isDone, String description) {
+        this.isDone = isDone;
+        this.description = description;
+    }
+
+    public void markAsDone() {
+        this.isDone = true;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public String getStatusIcon() {
+        return (this.isDone ? "\u2713" : "\u2718"); //return tick or X symbols
+    }
+
+    public String toString() {
+        return "[" + getStatusIcon() + "] " + description;
+    }
+
+    public String toStoreFormat() {
+        return "";
+    }
+}
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
new file mode 100644
index 0000000000..cb11254723
--- /dev/null
+++ b/src/main/java/duke/task/TaskList.java
@@ -0,0 +1,133 @@
+package duke.task;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import duke.utils.FileHelper;
+
+
+public class TaskList {
+    private List<Task> tasks;
+    private String path;
+    private String fileName;
+
+    /**
+     * Constructor for TaskList
+     */
+    public TaskList(String path, String fileName) {
+        tasks = new ArrayList<>();
+        this.path = path;
+        this.fileName = fileName;
+        loadDataFromFile();
+    }
+
+    /**
+     * Constructor for TaskList
+     */
+    private void loadDataFromFile() {
+        List<String> data = FileHelper.readFromFile(path, fileName);
+        for (int i = 0; i < data.size(); i++) {
+            addTask(data.get(i));
+        }
+    }
+
+    /**
+     * Save task to file
+     */
+    public void save() {
+        FileHelper.save(path, fileName, getStringifiedList());
+    }
+
+    /**
+     * add a task to task list
+     */
+    public void addTask(String data) {
+        Task task;
+        String[] parts = data.split("( \\| )");
+        assert(parts.length >= 3);
+        switch (parts[0]) {
+        case("T"):
+            task = new ToDo(Integer.parseInt(parts[1]) == 1, parts[2]);
+            break;
+        case("D"):
+            task = new Deadline(Integer.parseInt(parts[1]) == 1, parts[2], parts[3]);
+            break;
+        case("E"):
+            assert(parts.length == 4);
+            task = new Event(Integer.parseInt(parts[1]) == 1, parts[2], parts[3]);
+            break;
+        default:
+            task = new Task("default task");
+        }
+        tasks.add(task);
+        save();
+    }
+
+    /**
+     * add a task to tasks
+     */
+    public void addTask(Task task) {
+        tasks.add(task);
+        save();
+    }
+
+    public int getNumberOfTask() {
+        return tasks.size();
+    }
+
+    public Task get(int index) {
+        return tasks.get(index);
+    }
+
+    /**
+     * remove a task from task list
+     */
+    public void remove(int index) {
+        assert(index < tasks.size());
+        tasks.remove(index);
+        save();
+    }
+
+    /**
+     * mark a task as done by index
+     */
+    public void markAsDone(int index) {
+        tasks.get(index).markAsDone();
+        save();
+    }
+
+    private List<String> getStringifiedList() {
+        List <String> data = new ArrayList<>();
+        for (int i = 0; i < this.tasks.size(); i++) {
+            data.add(tasks.get(i).toStoreFormat());
+        }
+        return data;
+    }
+
+    /**
+     * prints task list info
+     */
+    public String printList() {
+        String message = "Here are the tasks in your list:\n";
+        int size = tasks.size();
+        for (int i = 0; i < size; i++) {
+            message += (i + 1) + "." + tasks.get(i).toString() + "\n";
+        }
+        System.out.println(message);
+        return message;
+    }
+
+    /**
+     * find tasks by keyword
+     */
+    public List<Task> find(String searchText) {
+        List<Task> results = new ArrayList<>();
+        for (int i = 0; i < tasks.size(); i++) {
+            if (tasks.get(i).getDescription().contains(searchText)) {
+                results.add(tasks.get(i));
+            }
+        }
+        return results;
+    }
+
+}
diff --git a/src/main/java/duke/task/TaskType.java b/src/main/java/duke/task/TaskType.java
new file mode 100644
index 0000000000..5f0c0832ba
--- /dev/null
+++ b/src/main/java/duke/task/TaskType.java
@@ -0,0 +1,32 @@
+package duke.task;
+
+public enum TaskType {
+    TODO, EVENT, DEADLINE;
+
+    /**
+     * return string of the enum
+     */
+    public String toString() {
+        switch (this) {
+        case TODO:
+            return "todo";
+        case EVENT :
+            return "event";
+        case DEADLINE:
+            return "deadline";
+        default:
+            return null;
+        }
+    }
+
+    /**
+     * return true if a string taskType is task
+     */
+    public static boolean isTask(String taskType) {
+        return taskType.equals(TODO.toString())
+                || taskType.equals(EVENT.toString()) || taskType.equals(DEADLINE.toString());
+    }
+}
+
+
+
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
new file mode 100644
index 0000000000..8e16e54ed6
--- /dev/null
+++ b/src/main/java/duke/task/ToDo.java
@@ -0,0 +1,28 @@
+package duke.task;
+
+/**
+ * Represents a ToDo Task.
+ */
+public class ToDo extends Task {
+
+    public ToDo(String description) {
+        super(description);
+    }
+
+    public ToDo(boolean isDone, String description) {
+        super(isDone, description);
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+
+    @Override
+    public String toStoreFormat() {
+        String type = "T";
+        String status = super.isDone ? "1" : "0";
+        String connect = " | ";
+        return type + connect + status + connect + description;
+    }
+}
diff --git a/src/main/java/duke/ui/DukeDialogBox.java b/src/main/java/duke/ui/DukeDialogBox.java
new file mode 100644
index 0000000000..678251622f
--- /dev/null
+++ b/src/main/java/duke/ui/DukeDialogBox.java
@@ -0,0 +1,57 @@
+package duke.ui;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+
+/**
+ * An example of a custom control using FXML.
+ * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
+ * containing text from the speaker.
+ */
+public class DukeDialogBox extends HBox {
+    @FXML
+    private Label dialog;
+    @FXML
+    private ImageView displayPicture;
+
+    private DukeDialogBox(String text, Image img) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DukeDialogBox.fxml"));
+            fxmlLoader.setController(this);
+            fxmlLoader.setRoot(this);
+            fxmlLoader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        dialog.setText(text);
+        displayPicture.setImage(img);
+    }
+
+    /**
+     * Flips the dialog box such that the ImageView is on the left and text on the right.
+     */
+    private void flip() {
+        ObservableList<Node> tmp = FXCollections.observableArrayList(this.getChildren());
+        Collections.reverse(tmp);
+        getChildren().setAll(tmp);
+        setAlignment(Pos.TOP_LEFT);
+    }
+
+    public static DukeDialogBox getDukeDialog(String text, Image img) {
+        var db = new DukeDialogBox(text, img);
+        db.flip();
+        return db;
+    }
+}
diff --git a/src/main/java/duke/ui/ErrorMessageBox.java b/src/main/java/duke/ui/ErrorMessageBox.java
new file mode 100644
index 0000000000..ed0fc641b0
--- /dev/null
+++ b/src/main/java/duke/ui/ErrorMessageBox.java
@@ -0,0 +1,38 @@
+package duke.ui;
+
+import java.io.IOException;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+
+/**
+ * An example of a custom control using FXML.
+ * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
+ * containing text from the speaker.
+ */
+public class ErrorMessageBox extends HBox {
+    @FXML
+    private Label dialog;
+    @FXML
+    private ImageView displayPicture;
+
+    private ErrorMessageBox(String text) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/ErrorMessageBox.fxml"));
+            fxmlLoader.setController(this);
+            fxmlLoader.setRoot(this);
+            fxmlLoader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        dialog.setText(text);
+    }
+
+    public static ErrorMessageBox getErrorMessageBox(String text) {
+        return new ErrorMessageBox(text);
+    }
+}
diff --git a/src/main/java/duke/ui/Main.java b/src/main/java/duke/ui/Main.java
new file mode 100644
index 0000000000..8bd564de8e
--- /dev/null
+++ b/src/main/java/duke/ui/Main.java
@@ -0,0 +1,32 @@
+package duke.ui;
+
+import java.io.IOException;
+
+import duke.KK;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+/**
+ * A GUI for KK using FXML.
+ */
+public class Main extends Application {
+
+    private KK kk = new KK("data/", "kk.txt");
+
+    @Override
+    public void start(Stage stage) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
+            AnchorPane ap = fxmlLoader.load();
+            Scene scene = new Scene(ap);
+            stage.setScene(scene);
+            fxmlLoader.<MainWindow>getController().setDuke(kk);
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/duke/ui/MainWindow.java b/src/main/java/duke/ui/MainWindow.java
new file mode 100644
index 0000000000..6cd7a91805
--- /dev/null
+++ b/src/main/java/duke/ui/MainWindow.java
@@ -0,0 +1,70 @@
+package duke.ui;
+
+import duke.KK;
+import duke.exceptions.DukeException;
+import duke.utils.Ui;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.VBox;
+
+/**
+ * Controller for MainWindow. Provides the layout for the other controls.
+ */
+public class MainWindow extends AnchorPane {
+    @FXML
+    private ScrollPane scrollPane;
+    @FXML
+    private VBox dialogContainer;
+    @FXML
+    private TextField userInput;
+    @FXML
+    private Button sendButton;
+
+    private KK duke;
+
+    private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/Pikachu.png"));
+
+    /**
+     * initialize KK and print help message.
+     */
+    @FXML
+    public void initialize() {
+        scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
+        dialogContainer.getChildren().addAll(
+                DukeDialogBox.getDukeDialog(new Ui().welcomeMessge(), dukeImage)
+        );
+    }
+
+    public void setDuke(KK d) {
+        duke = d;
+    }
+
+    /**
+     * Creates two dialog boxes, one echoing user input and the other containing KK's reply and then appends them to
+     * the dialog container.
+     */
+    @FXML
+    private void handleUserInput() {
+        String input = userInput.getText();
+        String response = null;
+        try {
+            response = duke.getResponse(input);
+            dialogContainer.getChildren().addAll(
+                    UserDialogBox.getUserDialog(input),
+                    DukeDialogBox.getDukeDialog(response, dukeImage)
+            );
+        } catch (DukeException e) {
+            e.printStackTrace();
+            dialogContainer.getChildren().addAll(
+                    UserDialogBox.getUserDialog(input),
+                    ErrorMessageBox.getErrorMessageBox(e.getMessage())
+            );
+        }
+
+        userInput.clear();
+    }
+}
diff --git a/src/main/java/duke/ui/UserDialogBox.java b/src/main/java/duke/ui/UserDialogBox.java
new file mode 100644
index 0000000000..d556146e97
--- /dev/null
+++ b/src/main/java/duke/ui/UserDialogBox.java
@@ -0,0 +1,38 @@
+package duke.ui;
+
+import java.io.IOException;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+
+/**
+ * An example of a custom control using FXML.
+ * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
+ * containing text from the speaker.
+ */
+public class UserDialogBox extends HBox {
+    @FXML
+    private Label dialog;
+    @FXML
+    private ImageView displayPicture;
+
+    private UserDialogBox(String text) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/UserDialogBox.fxml"));
+            fxmlLoader.setController(this);
+            fxmlLoader.setRoot(this);
+            fxmlLoader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        dialog.setText(text);
+    }
+
+    public static UserDialogBox getUserDialog(String text) {
+        return new UserDialogBox(text);
+    }
+}
diff --git a/src/main/java/duke/utils/FileHelper.java b/src/main/java/duke/utils/FileHelper.java
new file mode 100644
index 0000000000..58eabdf512
--- /dev/null
+++ b/src/main/java/duke/utils/FileHelper.java
@@ -0,0 +1,76 @@
+package duke.utils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+/**
+ * A helper class that contains method dealing with file operation.
+ * such as reading from a file, and write to a file.
+ */
+public class FileHelper {
+
+    /**
+     * Reads task list from a txt file in certain format.
+     * and return the data as a list of String.
+     *
+     * @param path the path to the folder that the file you wants to read resides in.
+     * @param fileName the name of the file that you wants to read.
+     * @return a list of String which every string represents a task in a format.
+     */
+    public static List<String> readFromFile(String path, String fileName) {
+
+        List<String> data = new ArrayList<>();
+
+        File file = new File(path + "/" + fileName);
+        try {
+            if (file.exists()) {
+                Scanner sc = new Scanner(file);
+                while (sc.hasNextLine()) {
+                    String line = sc.nextLine();
+                    data.add(line);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return data;
+    }
+
+    /**
+     * Saves the data in list of string to the path and file provided.
+     * if there is no such directory exist, it will make the directory.
+     *
+     * @param path the path to the folder that the file you wants to save resides in.
+     * @param fileName the name of the file that you wants to save the data to.
+     * @param data the data you wish to save in the format of list of string.
+     */
+    public static void save(String path, String fileName, List<String> data) {
+
+        createDirectoryIfNotExist(path);
+        writeToFile(path, fileName, data);
+    }
+
+    private static void writeToFile(String path, String fileName, List<String> data) {
+        try {
+            FileWriter writer = new FileWriter(path + "/" + fileName);
+
+            for (int i = 0; i < data.size(); i++) {
+                writer.write(data.get(i) + System.lineSeparator());
+            }
+            writer.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void createDirectoryIfNotExist(String path) {
+        File directory = new File(path);
+        if (!directory.exists()) {
+            directory.mkdir();
+        }
+    }
+}
diff --git a/src/main/java/duke/utils/Parser.java b/src/main/java/duke/utils/Parser.java
new file mode 100644
index 0000000000..d8107290db
--- /dev/null
+++ b/src/main/java/duke/utils/Parser.java
@@ -0,0 +1,55 @@
+package duke.utils;
+
+import duke.command.AddCommand;
+import duke.command.Command;
+import duke.command.DeleteCommand;
+import duke.command.DoneCommand;
+import duke.command.ExitCommand;
+import duke.command.FindCommand;
+import duke.command.HelpCommand;
+import duke.command.ListCommand;
+import duke.exceptions.DukeException;
+import duke.task.TaskType;
+
+/**
+ * A helper class that contains method dealing with command parsing.
+ * such as parsing a string to a command.
+ */
+public class Parser {
+
+    /**
+     * Parse the command in string to the correct Command Object.
+     *
+     * @param command the string that wants to be parsed.
+     * @return a Command which can be either ExitCommd, ListCommand, DoneCommand,
+     * DeleteCommand or a AddCommand.
+     * @throws DukeException  If the input string is not in the correct format.
+     */
+    public static Command parse(String command) throws DukeException {
+        String[] parts = command.split(" ", 2);
+        String keyword = parts[0];
+        if (keyword.equals("bye")) {
+            return new ExitCommand();
+        } else if (keyword.equals("list")) {
+            return new ListCommand();
+        } else if (keyword.equals("help")) {
+            return new HelpCommand();
+        } else if (keyword.equals("done")) {
+            int num = Integer.parseInt(command.split(" ")[1]);
+            return new DoneCommand(num - 1);
+        } else if (keyword.equals("delete")) {
+            int num = Integer.parseInt(command.split(" ")[1]);
+            return new DeleteCommand(num - 1);
+        } else if (keyword.equals("find")) {
+            return new FindCommand(command.split(" ")[1]);
+        } else if (TaskType.isTask(keyword)) {
+            if (parts.length < 2 || parts[1].isEmpty()) {
+                throw new DukeException(String.format("OOPS!!! The description of %s cannot be empty.", parts[0]));
+            } else {
+                return new AddCommand(parts[0], parts[1]);
+            }
+        } else {
+            throw new DukeException("OOPS!!! I'm sorry, but I don't know what that means :-(");
+        }
+    }
+}
diff --git a/src/main/java/duke/utils/Ui.java b/src/main/java/duke/utils/Ui.java
new file mode 100644
index 0000000000..a2c28665c9
--- /dev/null
+++ b/src/main/java/duke/utils/Ui.java
@@ -0,0 +1,158 @@
+package duke.utils;
+
+import java.util.List;
+import java.util.Scanner;
+
+import duke.task.Task;
+import duke.task.TaskList;
+
+
+
+/**
+ * A class that deals with interactions with the user.
+ */
+public class Ui {
+
+    /**
+     * Display the welcome message in the console.
+     */
+    public void showWelcome() {
+        String logo = "      _      _\n"
+                + "| | / /| | / /\n"
+                + "| |/ / | |/ /\n"
+                + "|   <  |   <\n"
+                + "|_|\\_\\ |_|\\_\\\n";
+        System.out.println("Hello from\n" + logo);
+        System.out.println("Hello! I'm KK\n"
+                + " What can I do for you?");
+    }
+
+    /**
+     * return a welcome message
+     */
+    public String welcomeMessge() {
+        String logo = "      _      _\n"
+                + "| | / /| | / /\n"
+                + "| |/ / | |/ /\n"
+                + "|   <  |   <\n"
+                + "|_|\\_\\ |_|\\_\\\n";
+        return ("Hello from\n" + logo
+            + "Hello! I'm KK\n"
+                + " What can I do for you?");
+    }
+
+    /**
+     * Listens for user input and return the user input as string.
+     *
+     * @return a string that user has input
+     */
+    public String readCommand() {
+        Scanner scanner = new Scanner(System.in);
+        String input = scanner.nextLine();
+        return input;
+    }
+
+    /**
+     * Display the error message in the console.
+     *
+     * @param message the error message
+     */
+    public void showError(String message) {
+        System.out.println("Error: " + message);
+    }
+
+    /**
+     * Display the removal message in the console.
+     *
+     * @param removedTask the task that has been removed
+     * @param tasks the latest task list (after remove the task above)
+     */
+    public String showRemovalMessage(Task removedTask, TaskList tasks) {
+        String message = "Noted. I've removed this task:\n";
+        message = message + removedTask.toString() + "\n";
+        message = message + "Now you have " + tasks.getNumberOfTask() + " tasks in the list.";
+
+        System.out.println(message);
+        return message;
+    }
+
+    /**
+     * Display the done message in the console.
+     *
+     * @param doneTask the task that has been done.
+     */
+    public String showDoneMessage(Task doneTask) {
+        String message = "Nice! I've marked this task as done:\n" + doneTask.toString();
+        System.out.println(message);
+        return message;
+    }
+
+    /**
+     * Display the add message in the console.
+     *
+     * @param newTask the task that has been added
+     * @param tasks the latest task list (after added the task above)
+     */
+    public String showAddMessage(Task newTask, TaskList tasks) {
+        String message = newTask.toString() + "\n";
+        message = message + "Now you have " + tasks.getNumberOfTask() + " tasks in the list.";
+        System.out.println(message);
+        return message;
+    }
+
+
+    /**
+     * Displays the list info in the console.
+     *
+     * @param tasks the latest task list
+     */
+    public String showListMessage(TaskList tasks) {
+        return tasks.printList();
+    }
+
+    /**
+     * Displays the list info in the console.
+     *
+     * @param tasks a list of task list
+     */
+    public String showListMessage(List<Task> tasks) {
+        String message = "";
+        int size = tasks.size();
+        for (int i = 0; i < size; ++i) {
+            message += (i + 1) + "." + tasks.get(i).toString() + "\n";
+        }
+        System.out.println(message);
+        return message;
+    }
+
+    public void showLine() {
+        System.out.println("-----------------------");
+    }
+
+    /**
+     * return helpMessage
+     */
+    public String helpMessage() {
+        String message = "list\n"
+                + "\n"
+                + "event <content> /at <time> \n"
+                + "\n"
+                + "deadline <content> /by <d/MM/yyyy HH:mm> \n"
+                + "\n"
+                + "todo <content>\n"
+                + "\n"
+                + "done <index>\n"
+                + "\n"
+                + "delete <index>\n"
+                + "\n"
+                + "bye\n";
+        return message;
+    }
+
+    /**
+     * Displays goodbye message
+     */
+    public void sayGoodBye() {
+        System.out.println("Bye. Hope to see you again soon!");
+    }
+}
diff --git a/src/main/resources/images/Pikachu.png b/src/main/resources/images/Pikachu.png
new file mode 100644
index 0000000000..2ec2b00b6d
Binary files /dev/null and b/src/main/resources/images/Pikachu.png differ
diff --git a/src/main/resources/view/DukeDialogBox.fxml b/src/main/resources/view/DukeDialogBox.fxml
new file mode 100644
index 0000000000..b0552d18d0
--- /dev/null
+++ b/src/main/resources/view/DukeDialogBox.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.text.Font?>
+
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Label fx:id="dialog" lineSpacing="1.0" minHeight="-Infinity" style="-fx-background-color: #7bc6cc; -fx-border-radius: 10 10 10 10; -fx-background-radius: 10 10 10 10;" text="Label" wrapText="true">
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+            <font>
+                <Font name="AppleGothic Regular" size="14.0" />
+            </font>
+        </Label>
+        <ImageView fx:id="displayPicture" fitHeight="58.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true" />
+    </children>
+    <padding>
+        <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
+    </padding>
+</fx:root>
diff --git a/src/main/resources/view/ErrorMessageBox.fxml b/src/main/resources/view/ErrorMessageBox.fxml
new file mode 100644
index 0000000000..737cc5d0f2
--- /dev/null
+++ b/src/main/resources/view/ErrorMessageBox.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+
+<fx:root alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Label fx:id="dialog" lineSpacing="1.0" minHeight="-Infinity" style="-fx-background-color: #ffe7e7;" text="Label" wrapText="true" />
+    </children>
+    <padding>
+        <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
+    </padding>
+</fx:root>
\ No newline at end of file
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
new file mode 100644
index 0000000000..83fddd291c
--- /dev/null
+++ b/src/main/resources/view/MainWindow.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.ui.MainWindow">
+    <children>
+        <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" />
+        <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" />
+        <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0">
+            <content>
+                <VBox fx:id="dialogContainer" prefHeight="552.0" prefWidth="388.0" />
+            </content>
+        </ScrollPane>
+    </children>
+</AnchorPane>
\ No newline at end of file
diff --git a/src/main/resources/view/UserDialogBox.fxml b/src/main/resources/view/UserDialogBox.fxml
new file mode 100644
index 0000000000..046cbd9e6b
--- /dev/null
+++ b/src/main/resources/view/UserDialogBox.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Label fx:id="dialog" text="Label" wrapText="true" />
+    </children>
+    <padding>
+        <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
+    </padding>
+</fx:root>
\ No newline at end of file
diff --git a/src/test/duke/utils/ParserTest.java b/src/test/duke/utils/ParserTest.java
new file mode 100644
index 0000000000..7ea72f5b1d
--- /dev/null
+++ b/src/test/duke/utils/ParserTest.java
@@ -0,0 +1,66 @@
+package duke.utils;
+
+import duke.command.*;
+import duke.exceptions.DukeException;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class ParserTest{
+
+    @Test
+    void parseAddCommand() {
+        String commandLine = "todo borrow book";
+
+        try {
+            assertEquals(Parser.parse(commandLine).getClass(), AddCommand.class);
+        } catch (DukeException e) {
+            fail();
+        }
+    }
+
+    @Test
+    void parseExitCommand() {
+        String commandLine = "bye";
+
+        try {
+            assertEquals(Parser.parse(commandLine).getClass(), ExitCommand.class);
+        } catch (DukeException e) {
+            fail();
+        }
+    }
+
+    @Test
+    void parseDeleteCommand() {
+        String commandLine = "delete 1";
+
+        try {
+            assertEquals(Parser.parse(commandLine).getClass(), DeleteCommand.class);
+        } catch (DukeException e) {
+            fail();
+        }
+    }
+
+    @Test
+    void parseDoneCommand() {
+        String commandLine = "done 1";
+
+        try {
+            assertEquals(Parser.parse(commandLine).getClass(), DoneCommand.class);
+        } catch (DukeException e) {
+            fail();
+        }
+    }
+
+    @Test
+    void parseListCommand() {
+        String commandLine = "list";
+
+        try {
+            assertEquals(Parser.parse(commandLine).getClass(), ListCommand.class);
+        } catch (DukeException e) {
+            fail();
+        }
+    }
+
+}
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e7..6b1466337c 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,54 @@
 Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
+      _      _
+| | / /| | / /
+| |/ / | |/ /
+|   <  |   <
+|_|\_\ |_|\_\
 
+Hello! I'm KK
+ What can I do for you?
+Got it. I've added this task:
+[T][✘] read book
+Now you have 1 tasks in the list.
+Got it. I've added this task:
+[D][✘] return book (by:  Sunday)
+Now you have 2 tasks in the list.
+Got it. I've added this task:
+[E][✘] project meeting (at:  Mon 2-4pm)
+Now you have 3 tasks in the list.
+Got it. I've added this task:
+[T][✘] join sports club
+Now you have 4 tasks in the list.
+Got it. I've added this task:
+[T][✘] borrow book
+Now you have 5 tasks in the list.
+Here are the tasks in your list:
+1.[T][✘] read book
+2.[D][✘] return book (by:  Sunday)
+3.[E][✘] project meeting (at:  Mon 2-4pm)
+4.[T][✘] join sports club
+5.[T][✘] borrow book
+Nice! I've marked this task as done:
+[T][✓] read book
+Nice! I've marked this task as done:
+[D][✓] return book (by:  Sunday)
+Nice! I've marked this task as done:
+[E][✓] project meeting (at:  Mon 2-4pm)
+Here are the tasks in your list:
+1.[T][✓] read book
+2.[D][✓] return book (by:  Sunday)
+3.[E][✓] project meeting (at:  Mon 2-4pm)
+4.[T][✘] join sports club
+5.[T][✘] borrow book
+ Noted. I've removed this task:
+[E][✓] project meeting (at:  Mon 2-4pm)
+Now you have 4 tasks in the list.
+Here are the tasks in your list:
+1.[T][✓] read book
+2.[D][✓] return book (by:  Sunday)
+3.[T][✘] join sports club
+4.[T][✘] borrow book
+☹ OOPS!!! I'm sorry, but I don't know what that means :-(
+☹ OOPS!!! The description of todo cannot be empty.
+☹ OOPS!!! The description of deadline cannot be empty.
+Bye. Hope to see you again soon!
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb2..24d1c4de11 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,16 @@
+todo read book
+deadline return book /by Sunday
+event project meeting /at Mon 2-4pm
+todo join sports club
+todo borrow book
+list
+done 1
+done 2
+done 3
+list
+delete 3
+list
+blah
+todo
+deadline
+bye
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index d0facc6310..398b1efae5 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,7 @@ REM delete output from previous run
 del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src -Xlint:none -d ..\bin ..\src\main\java\Duke.java
+javac  -cp ..\src -Xlint:none -d ..\bin ..\src\main\java\duke.java
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
@@ -15,7 +15,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 < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
old mode 100644
new mode 100755
index e169618a34..79f2e71e75
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -12,15 +12,17 @@ then
     rm ACTUAL.TXT
 fi
 
+export LC_ALL=en_GB.UTF-8
+
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src -Xlint:none -d ../bin ../src/main/java/Duke.java
+if ! javac -cp ../src -Xlint:none -d ../bin ../src/main/java/*.java
 then
-    echo "********** BUILD FAILURE **********"
+    echo "********** BUILD rFAILURE **********"
     exit 1
 fi
 
 # 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 < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
 cp EXPECTED.TXT EXPECTED-UNIX.TXT