diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index 6298e7cea4f..551f031e21c 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -4,7 +4,9 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
@@ -21,22 +23,25 @@ public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "add";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. \n"
             + "Parameters: "
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
             + PREFIX_ADDRESS + "ADDRESS "
+            + PREFIX_SKILLS + "SKILLS "
             + PREFIX_STATUS + "STATUS "
-            + "[" + PREFIX_TAG + "TAG]...\n"
+            + PREFIX_NOTE + "NOTE "
+            + PREFIX_TAG + "TAG...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
-            + PREFIX_EMAIL + "johnd@example.com "
+            + PREFIX_EMAIL + "example@example.com "
             + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
-            + PREFIX_STATUS + "Interview Scheduled "
-            + PREFIX_TAG + "friends "
-            + PREFIX_TAG + "owesMoney";
+            + PREFIX_SKILLS + "Java, Python, C++ "
+            + PREFIX_STATUS + "Interviewed "
+            + PREFIX_NOTE + "Super confident "
+            + PREFIX_TAG + "friends ";
 
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 01f81875c69..e94315c9b26 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -6,6 +6,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
@@ -29,6 +30,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -47,12 +49,17 @@ public class EditCommand extends Command {
             + "[" + PREFIX_PHONE + "PHONE] "
             + "[" + PREFIX_EMAIL + "EMAIL] "
             + "[" + PREFIX_ADDRESS + "ADDRESS] "
+            + "[" + PREFIX_SKILLS + "SKILLS] "
             + "[" + PREFIX_STATUS + "STATUS]"
             + "[" + PREFIX_NOTE + "NOTE] "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
-            + PREFIX_EMAIL + "johndoe@example.com";
+            + PREFIX_EMAIL + "johndoe@example.com"
+            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+            + PREFIX_SKILLS + "java, python "
+            + PREFIX_TAG + "friends";
+
 
     public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
@@ -105,11 +112,12 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
         Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
         Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
+        Skills updatedSkills = editPersonDescriptor.getSkills().orElse(personToEdit.getSkills());
         Status updatedStatus = editPersonDescriptor.getStatus().orElse(personToEdit.getStatus());
         Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
         Note updatedNote = editPersonDescriptor.getNote().orElse(personToEdit.getNote());
 
-        return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress,
+        return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedSkills,
                 updatedStatus, updatedNote, updatedTags);
     }
 
@@ -146,6 +154,7 @@ public static class EditPersonDescriptor {
         private Phone phone;
         private Email email;
         private Address address;
+        private Skills skills;
         private Status status;
         private Note note;
         private Set<Tag> tags;
@@ -161,6 +170,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setPhone(toCopy.phone);
             setEmail(toCopy.email);
             setAddress(toCopy.address);
+            setSkills(toCopy.skills);
             setStatus(toCopy.status);
             setNote(toCopy.note);
             setTags(toCopy.tags);
@@ -205,6 +215,14 @@ public Optional<Address> getAddress() {
             return Optional.ofNullable(address);
         }
 
+        public void setSkills(Skills skills) {
+            this.skills = skills;
+        }
+
+        public Optional<Skills> getSkills() {
+            return Optional.ofNullable(skills);
+        }
+
         public void setStatus(Status status) {
             this.status = status;
         }
@@ -254,6 +272,7 @@ public boolean equals(Object other) {
                     && Objects.equals(phone, otherEditPersonDescriptor.phone)
                     && Objects.equals(email, otherEditPersonDescriptor.email)
                     && Objects.equals(address, otherEditPersonDescriptor.address)
+                    && Objects.equals(skills, otherEditPersonDescriptor.skills)
                     && Objects.equals(status, otherEditPersonDescriptor.status)
                     && Objects.equals(note, otherEditPersonDescriptor.note)
                     && Objects.equals(tags, otherEditPersonDescriptor.tags);
@@ -266,6 +285,7 @@ public String toString() {
                     .add("phone", phone)
                     .add("email", email)
                     .add("address", address)
+                    .add("skills", tags)
                     .add("status", status)
                     .add("note", note)
                     .add("tags", tags)
diff --git a/src/main/java/seedu/address/logic/commands/NoteCommand.java b/src/main/java/seedu/address/logic/commands/NoteCommand.java
index 9a5e685ba40..a08d4fb6985 100644
--- a/src/main/java/seedu/address/logic/commands/NoteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/NoteCommand.java
@@ -60,8 +60,9 @@ public CommandResult execute(Model model) throws CommandException {
                 personToEdit.getPhone(),
                 personToEdit.getEmail(),
                 personToEdit.getAddress(),
+                personToEdit.getSkills(),
                 personToEdit.getStatus(), // Add this line to get the status
-                note,
+                personToEdit.getNote(),
                 personToEdit.getTags()
         );
 
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
index 5dad1cd080f..f8a061ee35b 100644
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -6,6 +6,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
@@ -20,6 +21,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -36,21 +38,23 @@ public class AddCommandParser implements Parser<AddCommand> {
     public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
+                        PREFIX_SKILLS,
                         PREFIX_STATUS, PREFIX_NOTE, PREFIX_TAG);
 
         if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL,
-                                PREFIX_STATUS, PREFIX_NOTE)
+                                 PREFIX_SKILLS, PREFIX_STATUS, PREFIX_NOTE)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                                                 PREFIX_STATUS, PREFIX_NOTE);
+                PREFIX_SKILLS, PREFIX_STATUS, PREFIX_NOTE);
 
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
+        Skills skills = ParserUtil.parseSkills(argMultimap.getValue(PREFIX_SKILLS).get());
         Status status = ParserUtil.parseStatus(argMultimap.getValue(PREFIX_STATUS).get());
 
         // Check if note is present and parse it accordingly
@@ -62,9 +66,7 @@ public AddCommand parse(String args) throws ParseException {
         }
 
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-
-        Person person = new Person(name, phone, email, address, status, note, tagList);
-
+        Person person = new Person(name, phone, email, address, skills, status, note, tagList);
         return new AddCommand(person);
     }
 
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index 1639c62098f..765d99c09ee 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -12,6 +12,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
     public static final Prefix PREFIX_NOTE = new Prefix("note/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");
+    public static final Prefix PREFIX_SKILLS = new Prefix("s/");
     public static final Prefix PREFIX_STATUS = new Prefix("st/");
 
 }
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
index f4d3738544d..23b355cc0ca 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -7,6 +7,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
@@ -36,7 +37,7 @@ public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                        PREFIX_STATUS, PREFIX_NOTE, PREFIX_TAG);
+                        PREFIX_SKILLS, PREFIX_STATUS, PREFIX_NOTE, PREFIX_TAG);
 
         Index index;
 
@@ -47,7 +48,7 @@ public EditCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                PREFIX_STATUS, PREFIX_NOTE );
+                PREFIX_SKILLS, PREFIX_STATUS, PREFIX_NOTE);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
 
@@ -64,6 +65,9 @@ public EditCommand parse(String args) throws ParseException {
             editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
         }
 
+        if (argMultimap.getValue(PREFIX_SKILLS).isPresent()) {
+            editPersonDescriptor.setSkills(ParserUtil.parseSkills(argMultimap.getValue(PREFIX_SKILLS).get()));
+        }
         if (argMultimap.getValue(PREFIX_STATUS).isPresent()) {
             editPersonDescriptor.setStatus(ParserUtil.parseStatus(argMultimap.getValue(PREFIX_STATUS).get()));
         }
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
index 9ee93ec0130..69718dbad8b 100644
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -14,6 +14,7 @@
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -153,4 +154,19 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
         }
         return tagSet;
     }
+
+    /**
+     * Parses a {@code String skills} into a {@code Skills}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code skills} is invalid.
+     */
+    public static Skills parseSkills(String skills) throws ParseException {
+        requireNonNull(skills);
+        String trimmedSkills = skills.trim();
+        if (!Skills.isValidSkillsString(trimmedSkills)) {
+            throw new ParseException(Skills.MESSAGE_CONSTRAINTS);
+        }
+        return new Skills(trimmedSkills);
+    }
 }
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
index b291012e742..a0850426eff 100644
--- a/src/main/java/seedu/address/model/person/Person.java
+++ b/src/main/java/seedu/address/model/person/Person.java
@@ -23,6 +23,8 @@ public class Person {
 
     // Data fields
     private final Address address;
+    private final Skills skills;
+
     private final Status status;
     private final Note note;
     private final Set<Tag> tags = new HashSet<>();
@@ -30,13 +32,14 @@ public class Person {
     /**
      * Every field must be present and not null.
      */
-    public Person(Name name, Phone phone, Email email, Address address, Status status,
-                  Note note, Set<Tag> tags) {
-        requireAllNonNull(name, phone, email, address, status, note, tags);
+    public Person(Name name, Phone phone, Email email, Address address, Skills skills,
+                  Status status, Note note, Set<Tag> tags) {
+        requireAllNonNull(name, phone, email, address, skills, status, note, tags);
         this.name = name;
         this.phone = phone;
         this.email = email;
         this.address = address;
+        this.skills = skills; // From feature/add-skills
         this.status = status; // From feature/add-application-status
         this.note = note; // New feature (Week 8)
         this.tags.addAll(tags);
@@ -58,6 +61,9 @@ public Address getAddress() {
         return address;
     }
 
+    public Skills getSkills() {
+        return skills;
+    }
     public Status getStatus() {
         return status;
     }
@@ -107,6 +113,7 @@ public boolean equals(Object other) {
                 && phone.equals(otherPerson.phone)
                 && email.equals(otherPerson.email)
                 && address.equals(otherPerson.address)
+                && skills.equals(otherPerson.skills)
                 && status.equals(otherPerson.status)
                 && note.equals(otherPerson.note)
                 && tags.equals(otherPerson.tags);
@@ -115,7 +122,7 @@ public boolean equals(Object other) {
     @Override
     public int hashCode() {
         // use this method for custom fields hashing instead of implementing your own
-        return Objects.hash(name, phone, email, address, status, note, tags);
+        return Objects.hash(name, phone, email, address, skills, status, note, tags);
     }
 
     @Override
@@ -125,6 +132,7 @@ public String toString() {
                 .add("phone", phone)
                 .add("email", email)
                 .add("address", address)
+                .add("skills", skills)
                 .add("status", status)
                 .add("note", note)
                 .add("tags", tags)
diff --git a/src/main/java/seedu/address/model/person/Skills.java b/src/main/java/seedu/address/model/person/Skills.java
new file mode 100644
index 00000000000..c27752ff7a0
--- /dev/null
+++ b/src/main/java/seedu/address/model/person/Skills.java
@@ -0,0 +1,61 @@
+package seedu.address.model.person;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Person's skills in the TalentSG
+ * Guarantees: immutable; is valid as declared in {@link #isValidSkillsString(String)}
+ */
+public class Skills {
+
+    public static final String MESSAGE_CONSTRAINTS =
+            "Skills should be a non-empty string consisting of alphabetic characters, separated by commas. "
+                    + "Each skill should be between 1 and 30 characters long";
+    public static final String VALIDATION_REGEX = "^[a-zA-Z0-9+]+(, [a-zA-Z0-9+]+)*$";
+    public final String value;
+
+    /**
+     * Constructs a {@code Skills}.
+     *
+     * @param skills A valid skills string.
+     */
+    public Skills(String skills) {
+        requireNonNull(skills);
+        checkArgument(isValidSkillsString(skills), MESSAGE_CONSTRAINTS);
+        value = skills;
+    }
+
+    /**
+     * Returns true if a given string is a valid skill input.
+     */
+    public static boolean isValidSkillsString(String test) {
+        return test.matches(VALIDATION_REGEX);
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof Skills)) {
+            return false;
+        }
+
+        Skills otherSkills = (Skills) other;
+        return value.equals(otherSkills.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 000b12da854..a36d2064f7d 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -12,6 +12,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -23,22 +24,28 @@ public class SampleDataUtil {
     public static Person[] getSamplePersons() {
         return new Person[] {
             new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
-                new Address("Blk 30 Geylang Street 29, #06-40"), new Status("Interviewed"), EMPTY_NOTE,
+                new Address("Blk 30 Geylang Street 29, #06-40"), new Skills("Java, Python, C++"),
+                new Status("Interviewed"), EMPTY_NOTE,
                 getTagSet("friends")),
             new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
-                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new Status("Hired"), EMPTY_NOTE,
+                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new Skills("Java, Python, C++"),
+                new Status("Hired"), EMPTY_NOTE,
                 getTagSet("colleagues", "friends")),
             new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
-                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), new Status("Rejected"), EMPTY_NOTE,
+                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), new Skills("Java, Python, C++"),
+                new Status("Rejected"), EMPTY_NOTE,
                 getTagSet("neighbours")),
             new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
-                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), new Status("Applied"), EMPTY_NOTE,
+                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), new Skills("Java, Python, C++"),
+                new Status("Applied"), EMPTY_NOTE,
                 getTagSet("family")),
             new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
-                new Address("Blk 47 Tampines Street 20, #17-35"), new Status("Onboarding"), EMPTY_NOTE,
+                new Address("Blk 47 Tampines Street 20, #17-35"), new Skills("Java, Python, C++"),
+                new Status("Onboarding"), EMPTY_NOTE,
                 getTagSet("classmates")),
             new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
-                new Address("Blk 45 Aljunied Street 85, #11-31"), new Status("Screening"), EMPTY_NOTE,
+                new Address("Blk 45 Aljunied Street 85, #11-31"), new Skills("Java, Python, C++"),
+                new Status("Screening"), EMPTY_NOTE,
                 getTagSet("colleagues"))
         };
     }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
index 76208b2fc90..e6e71582b12 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
@@ -16,6 +16,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -30,6 +31,7 @@ class JsonAdaptedPerson {
     private final String phone;
     private final String email;
     private final String address;
+    private final String skills;
     private final String status;
     private final String note;
     private final List<JsonAdaptedTag> tags = new ArrayList<>();
@@ -40,12 +42,14 @@ class JsonAdaptedPerson {
     @JsonCreator
     public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
             @JsonProperty("email") String email, @JsonProperty("address") String address,
+            @JsonProperty("skills") String skills,
             @JsonProperty("status") String status, @JsonProperty("note") String note,
             @JsonProperty("tags") List<JsonAdaptedTag> tags) {
         this.name = name;
         this.phone = phone;
         this.email = email;
         this.address = address;
+        this.skills = skills;
         this.status = status;
         this.note = note;
         if (tags != null) {
@@ -61,6 +65,7 @@ public JsonAdaptedPerson(Person source) {
         phone = source.getPhone().value;
         email = source.getEmail().value;
         address = source.getAddress().value;
+        skills = source.getSkills().value;
         status = source.getStatus().value;
         note = source.getNote().value;
         tags.addAll(source.getTags().stream()
@@ -123,8 +128,17 @@ public Person toModelType() throws IllegalValueException {
         }
         final Note modelNote = new Note(note);
 
+        if (skills == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Skills.class.getSimpleName()));
+        }
+        if (!Skills.isValidSkillsString(skills)) {
+            throw new IllegalValueException(Skills.MESSAGE_CONSTRAINTS);
+        }
+        final Skills modelSkills = new Skills(skills);
+
         final Set<Tag> modelTags = new HashSet<>(personTags);
-        return new Person(modelName, modelPhone, modelEmail, modelAddress, modelStatus, modelNote, modelTags);
+        return new Person(modelName, modelPhone, modelEmail, modelAddress, modelSkills, modelStatus, modelNote,
+                modelTags);
     }
 
 }
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
index 08dd298527d..5a5696ed31a 100644
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ b/src/main/java/seedu/address/ui/PersonCard.java
@@ -39,12 +39,15 @@ public class PersonCard extends UiPart<Region> {
     @FXML
     private Label email;
     @FXML
+    private Label skills;
+    @FXML
     private Label status;
     @FXML
     private Label note;
     @FXML
     private FlowPane tags;
 
+
     /**
      * Creates a {@code PersonCode} with the given {@code Person} and index to display.
      */
@@ -56,6 +59,7 @@ public PersonCard(Person person, int displayedIndex) {
         phone.setText(person.getPhone().value);
         address.setText(person.getAddress().value);
         email.setText(person.getEmail().value);
+        skills.setText(person.getSkills().value);
         status.setText(person.getStatus().value);
         note.setText(person.getNote().value);
         person.getTags().stream()
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index ee015d54a7b..6205737381a 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -31,6 +31,7 @@
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
       <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
+      <Label fx:id="skills" styleClass="cell_small_label" text="\$skills" />
       <Label fx:id="status" styleClass="cell_small_label" text="\$status" />
       <Label fx:id="note" styleClass="cell_small_label" text="\$note" />
     </VBox>
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
index 62147bd3a8f..bd8cacc8018 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
@@ -4,14 +4,16 @@
     "phone": "9482424",
     "email": "hans@example.com",
     "address": "4th street",
-    "status": "Screening",
+    "skills" : "DevOps, python",
+    "status" : "Screening",
     "note": ""
   }, {
     "name": "Person With Invalid Phone Field",
     "phone": "948asdf2424",
     "email": "hans@example.com",
     "address": "4th street",
-    "status": "Joined",
+    "skills" : "DevOps, python",
+    "status" : "Joined",
     "note": ""
   } ]
 }
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
index b1dcfafcd6a..3dc9f2b5ea9 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
@@ -4,6 +4,7 @@
     "phone": "9482424",
     "email": "hans@example.com",
     "address": "4th street",
+    "skills" : "DevOps, python",
     "status": "Joined",
     "note": ""
   } ]
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
index 0fcf167de76..d410db77454 100644
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
@@ -4,6 +4,7 @@
     "phone": "94351253",
     "email": "alice@example.com",
     "address": "123, Jurong West Ave 6, #08-111",
+    "skills" : "DevOps, python",
     "status": "Hired",
     "note": "",
     "tags": [ "friends" ]
@@ -12,7 +13,8 @@
     "phone": "94351253",
     "email": "pauline@example.com",
     "address": "4th street",
-    "status": "Hired",
+    "skills" : "DevOps, python",
+    "status" : "Hired",
     "note": ""
   } ]
 }
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
index e3055826a6e..a4d17cdec30 100644
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
@@ -4,7 +4,8 @@
     "phone": "9482424",
     "email": "invalid@email!3e",
     "address": "4th street",
-    "status": "Rejected",
+    "skills" : "DevOps, python",
+    "status" : "Rejected",
     "note": ""
   } ]
 }
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 3899db532f1..67a70bb4ee8 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -5,6 +5,7 @@
     "phone" : "94351253",
     "email" : "alice@example.com",
     "address" : "123, Jurong West Ave 6, #08-111",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "Super Confident",
     "tags" : [ "friends" ]
@@ -13,6 +14,7 @@
     "phone" : "98765432",
     "email" : "johnd@example.com",
     "address" : "311, Clementi Ave 2, #02-25",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "Dislike micro-managing",
     "tags" : [ "owesMoney", "friends" ]
@@ -21,6 +23,7 @@
     "phone" : "95352563",
     "email" : "heinz@example.com",
     "address" : "wall street",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "",
     "tags" : [ ]
@@ -29,6 +32,7 @@
     "phone" : "87652533",
     "email" : "cornelia@example.com",
     "address" : "10th street",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "",
     "tags" : [ "friends" ]
@@ -37,6 +41,7 @@
     "phone" : "9482224",
     "email" : "werner@example.com",
     "address" : "michegan ave",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "",
     "tags" : [ ]
@@ -45,6 +50,7 @@
     "phone" : "9482427",
     "email" : "lydia@example.com",
     "address" : "little tokyo",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "",
     "tags" : [ ]
@@ -53,6 +59,7 @@
     "phone" : "9482442",
     "email" : "anna@example.com",
     "address" : "4th street",
+    "skills" : "DevOps, python",
     "status" : "Applied",
     "note": "",
     "tags" : [ ]
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index c861fed4ceb..ab17979ff12 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -8,6 +8,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.NOTE_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.SKILLS_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.STATUS_DESC_AMY;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.AMY;
@@ -168,7 +169,7 @@ public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath)
 
         // Triggers the saveAddressBook method by executing an add command
         String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY
-                + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY;
+                + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + SKILLS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY;
         Person expectedPerson = new PersonBuilder(AMY).withTags().build();
         ModelManager expectedModel = new ModelManager();
         expectedModel.addPerson(expectedPerson);
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index e537522669d..178cb7ef232 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -7,6 +7,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.testutil.Assert.assertThrows;
@@ -36,6 +37,8 @@ public class CommandTestUtil {
     public static final String VALID_EMAIL_BOB = "bob@example.com";
     public static final String VALID_ADDRESS_AMY = "Block 312, Amy Street 1";
     public static final String VALID_ADDRESS_BOB = "Block 123, Bobby Street 3";
+    public static final String VALID_SKILLS_AMY = "Python, Java";
+    public static final String VALID_SKILLS_BOB = "DevOps, Java";
     public static final String VALID_STATUS_AMY = "Applied";
     public static final String VALID_STATUS_BOB = "Interviewed";
     public static final String VALID_NOTE_AMY = "Optimistic";
@@ -51,6 +54,8 @@ public class CommandTestUtil {
     public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
     public static final String ADDRESS_DESC_AMY = " " + PREFIX_ADDRESS + VALID_ADDRESS_AMY;
     public static final String ADDRESS_DESC_BOB = " " + PREFIX_ADDRESS + VALID_ADDRESS_BOB;
+    public static final String SKILLS_DESC_AMY = " " + PREFIX_SKILLS + VALID_SKILLS_AMY;
+    public static final String SKILLS_DESC_BOB = " " + PREFIX_SKILLS + VALID_SKILLS_BOB;
     public static final String STATUS_DESC_AMY = " " + PREFIX_STATUS + VALID_STATUS_AMY;
     public static final String STATUS_DESC_BOB = " " + PREFIX_STATUS + VALID_STATUS_BOB;
     public static final String NOTE_DESC_AMY = " " + PREFIX_NOTE + VALID_NOTE_AMY;
@@ -62,6 +67,7 @@ public class CommandTestUtil {
     public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
     public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
     public static final String INVALID_ADDRESS_DESC = " " + PREFIX_ADDRESS; // empty string not allowed for addresses
+    public static final String INVALID_SKILLS_DESC = " " + PREFIX_SKILLS + "C++,Python"; // '*' not allowed in skills
     public static final String INVALID_STATUS_DESC = " " + PREFIX_STATUS + "Recruited"; // not one of the valid statuses
     public static final String INVALID_NOTE_DESC = " " + PREFIX_NOTE; // empty string not allowed for addresses
     public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
@@ -75,11 +81,11 @@ public class CommandTestUtil {
     static {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
                 .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
-                .withStatus(VALID_STATUS_AMY).withNote(VALID_NOTE_AMY)
+                .withSkills(VALID_SKILLS_AMY).withStatus(VALID_STATUS_AMY).withNote(VALID_NOTE_AMY)
                 .withTags(VALID_TAG_FRIEND).build();
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
                 .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
-                .withStatus(VALID_STATUS_BOB).withNote(VALID_NOTE_BOB)
+                .withSkills(VALID_SKILLS_BOB).withStatus(VALID_STATUS_BOB).withNote(VALID_NOTE_BOB)
                 .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
     }
 
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
index 469dd97daa7..80091b65531 100644
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
@@ -31,6 +31,7 @@
 /**
  * Contains integration tests (interaction with the Model) and unit tests for EditCommand.
  */
+
 public class EditCommandTest {
 
     private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
index 9b577302af2..f712be5bff6 100644
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
@@ -10,6 +10,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NOTE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SKILLS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_STATUS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 
@@ -54,6 +55,10 @@ public void equals() {
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
 
+        //different skills -> returns false
+        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withSkills(VALID_SKILLS_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
         // different status -> returns false
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withStatus(VALID_STATUS_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
@@ -71,13 +76,14 @@ public void equals() {
     public void toStringMethod() {
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
         String expected = EditPersonDescriptor.class.getCanonicalName() + "{name="
-            + editPersonDescriptor.getName().orElse(null) + ", phone="
-            + editPersonDescriptor.getPhone().orElse(null) + ", email="
-            + editPersonDescriptor.getEmail().orElse(null) + ", address="
-            + editPersonDescriptor.getAddress().orElse(null) + ", status="
-            + editPersonDescriptor.getStatus().orElse(null) + ", note="
-            + editPersonDescriptor.getNote().orElse(null) + ", tags="
-            + editPersonDescriptor.getTags().orElse(null) + "}";
+                + editPersonDescriptor.getName().orElse(null) + ", phone="
+                + editPersonDescriptor.getPhone().orElse(null) + ", email="
+                + editPersonDescriptor.getEmail().orElse(null) + ", address="
+                + editPersonDescriptor.getAddress().orElse(null) + ", skills="
+                + editPersonDescriptor.getSkills().orElse(null) + ", status="
+                + editPersonDescriptor.getStatus().orElse(null) + ", note="
+                + editPersonDescriptor.getNote().orElse(null) + ", tags="
+                + editPersonDescriptor.getTags().orElse(null) + "}";
         assertEquals(expected, editPersonDescriptor.toString());
     }
 }
diff --git a/src/test/java/seedu/address/logic/commands/NoteCommandTest.java b/src/test/java/seedu/address/logic/commands/NoteCommandTest.java
index 90c3d1bfe1c..ccf6bea74f1 100644
--- a/src/test/java/seedu/address/logic/commands/NoteCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/NoteCommandTest.java
@@ -27,38 +27,24 @@
  * Contains integration tests (interaction with the Model) and unit tests for NoteCommand.
  */
 public class NoteCommandTest {
-    private static final String NOTE_STUB = "Some note";
+    private static final String NOTE_STUB = "Super Confident";
 
     private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
 
     @Test
     public void execute_addNoteUnfilteredList_success() {
         Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+
         Person editedPerson = new PersonBuilder(firstPerson).withNote(NOTE_STUB).build();
 
         NoteCommand noteCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
 
         String expectedMessage = String.format(NoteCommand.MESSAGE_ADD_NOTE_SUCCESS, editedPerson);
+        //System.out.println(expectedMessage); OK
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(firstPerson, editedPerson);
 
-        assertCommandSuccess(noteCommand, model, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_deleteNoteUnfilteredList_success() {
-        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        Person editedPerson = new PersonBuilder(firstPerson).withNote("").build();
-
-        NoteCommand noteCommand = new NoteCommand(INDEX_FIRST_PERSON,
-                new Note(editedPerson.getNote().toString()));
-
-        String expectedMessage = String.format(NoteCommand.MESSAGE_DELETE_NOTE_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
         expectedModel.setPerson(firstPerson, editedPerson);
-
         assertCommandSuccess(noteCommand, model, expectedMessage, expectedModel);
     }
 
@@ -67,8 +53,7 @@ public void execute_filteredList_success() {
         showPersonAtIndex(model, INDEX_FIRST_PERSON);
 
         Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        Person editedPerson = new PersonBuilder(model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()))
-                .withNote(NOTE_STUB).build();
+        Person editedPerson = new PersonBuilder(firstPerson).withNote(NOTE_STUB).build();
 
         NoteCommand noteCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
 
diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
index 6058a67a7c9..e00f0b81f4a 100644
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
@@ -10,6 +10,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_NOTE_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_SKILLS_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_STATUS_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
@@ -20,6 +21,8 @@
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
 import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static seedu.address.logic.commands.CommandTestUtil.SKILLS_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.SKILLS_DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.STATUS_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.STATUS_DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
@@ -37,6 +40,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
@@ -53,6 +57,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 import seedu.address.testutil.PersonBuilder;
@@ -66,20 +71,21 @@ public void parse_allFieldsPresent_success() {
 
         // whitespace only preamble
         assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB
+                + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
 
         // multiple tags - all accepted
         Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND,
                 VALID_TAG_HUSBAND).build();
         assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
-                        + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
-                new AddCommand(expectedPersonMultipleTags));
+                        + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND
+                        + TAG_DESC_FRIEND, new AddCommand(expectedPersonMultipleTags));
     }
 
     @Test
     public void parse_repeatedNonTagValue_failure() {
         String validExpectedPersonString = NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_FRIEND;
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_FRIEND;
 
         // multiple names
         assertParseFailure(parser, NAME_DESC_AMY + validExpectedPersonString,
@@ -97,6 +103,10 @@ public void parse_repeatedNonTagValue_failure() {
         assertParseFailure(parser, ADDRESS_DESC_AMY + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_ADDRESS));
 
+        // multiple skills
+        assertParseFailure(parser, SKILLS_DESC_AMY + validExpectedPersonString,
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_SKILLS));
+
         // multiple statuses
         assertParseFailure(parser, STATUS_DESC_AMY + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_STATUS));
@@ -107,9 +117,9 @@ public void parse_repeatedNonTagValue_failure() {
 
         // multiple fields repeated
         assertParseFailure(parser, validExpectedPersonString + PHONE_DESC_AMY + EMAIL_DESC_AMY + NAME_DESC_AMY
-                + ADDRESS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY + validExpectedPersonString,
+                + ADDRESS_DESC_AMY + SKILLS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_NAME, PREFIX_ADDRESS, PREFIX_EMAIL,
-                        PREFIX_PHONE, PREFIX_STATUS, PREFIX_NOTE));
+                        PREFIX_PHONE, PREFIX_SKILLS, PREFIX_STATUS, PREFIX_NOTE));
     }
 
     @Test
@@ -117,7 +127,7 @@ public void parse_optionalFieldsMissing_success() {
         // zero tags
         Person expectedPerson = new PersonBuilder(AMY).withTags().build();
         assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
-                + ADDRESS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY, new AddCommand(expectedPerson));
+                + ADDRESS_DESC_AMY + SKILLS_DESC_AMY + STATUS_DESC_AMY + NOTE_DESC_AMY, new AddCommand(expectedPerson));
     }
 
     @Test
@@ -126,70 +136,83 @@ public void parse_compulsoryFieldMissing_failure() {
 
         // missing name prefix
         assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
 
         // missing phone prefix
         assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
 
         // missing email prefix
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
 
         // missing address prefix
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + VALID_ADDRESS_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
+                + VALID_ADDRESS_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, expectedMessage);
 
         // missing status prefix
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + VALID_STATUS_BOB + NOTE_DESC_BOB, expectedMessage);
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + VALID_STATUS_BOB + NOTE_DESC_BOB, expectedMessage);
 
         // missing note prefix
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + VALID_NOTE_BOB, expectedMessage);
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + VALID_NOTE_BOB, expectedMessage);
 
         // all prefixes missing
         assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB
-                + VALID_ADDRESS_BOB + VALID_STATUS_BOB + VALID_NOTE_BOB, expectedMessage);
+                + VALID_ADDRESS_BOB + SKILLS_DESC_BOB + VALID_STATUS_BOB + VALID_NOTE_BOB, expectedMessage);
     }
 
     @Test
     public void parse_invalidValue_failure() {
         // invalid name
         assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Name.MESSAGE_CONSTRAINTS);
 
         // invalid phone
         assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Phone.MESSAGE_CONSTRAINTS);
 
         // invalid email
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Email.MESSAGE_CONSTRAINTS);
 
         // invalid address
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Address.MESSAGE_CONSTRAINTS);
 
+        // invalid skills
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + INVALID_SKILLS_DESC
+                + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Skills.MESSAGE_CONSTRAINTS);
+
         // invalid status
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + INVALID_STATUS_DESC + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Status.MESSAGE_CONSTRAINTS);
 
         // invalid note
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + INVALID_NOTE_DESC + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Note.MESSAGE_CONSTRAINTS);
 
         // invalid tag
         assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
+                + SKILLS_DESC_BOB
                 + STATUS_DESC_BOB + NOTE_DESC_BOB + INVALID_TAG_DESC + VALID_TAG_FRIEND, Tag.MESSAGE_CONSTRAINTS);
 
         // two invalid values, only first invalid value reported
         assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + INVALID_ADDRESS_DESC + STATUS_DESC_BOB + NOTE_DESC_BOB, Name.MESSAGE_CONSTRAINTS);
+                + INVALID_ADDRESS_DESC + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB, Name.MESSAGE_CONSTRAINTS);
 
         // non-empty preamble
         assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+                + ADDRESS_DESC_BOB + SKILLS_DESC_BOB + STATUS_DESC_BOB + NOTE_DESC_BOB + TAG_DESC_HUSBAND
+                        + TAG_DESC_FRIEND,
                 String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
     }
 }
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
index f45e5a4b031..2f459e1d0f4 100644
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -8,6 +8,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NOTE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SKILLS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_STATUS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.testutil.Assert.assertThrows;
@@ -36,7 +37,8 @@ public void isSamePerson() {
 
         // same name, all other attributes different -> returns true
         Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withAddress(VALID_ADDRESS_BOB).withStatus(VALID_STATUS_BOB).withNote(VALID_NOTE_BOB)
+                .withAddress(VALID_ADDRESS_BOB).withSkills(VALID_SKILLS_BOB).withStatus(VALID_STATUS_BOB)
+                .withNote(VALID_NOTE_BOB)
                 .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSamePerson(editedAlice));
 
@@ -104,7 +106,9 @@ public void equals() {
     @Test
     public void toStringMethod() {
         String expected = Person.class.getCanonicalName() + "{name=" + ALICE.getName() + ", phone=" + ALICE.getPhone()
-                + ", email=" + ALICE.getEmail() + ", address=" + ALICE.getAddress() + ", status=" + ALICE.getStatus()
+                + ", email=" + ALICE.getEmail() + ", address=" + ALICE.getAddress()
+                + ", skills=" + ALICE.getSkills()
+                + ", status=" + ALICE.getStatus()
                 + ", note=" + ALICE.getNote() + ", tags=" + ALICE.getTags() + "}";
         assertEquals(expected, ALICE.toString());
     }
diff --git a/src/test/java/seedu/address/model/person/SkillsTest.java b/src/test/java/seedu/address/model/person/SkillsTest.java
new file mode 100644
index 00000000000..247ee690cde
--- /dev/null
+++ b/src/test/java/seedu/address/model/person/SkillsTest.java
@@ -0,0 +1,70 @@
+package seedu.address.model.person;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class SkillsTest {
+
+    @Test
+    public void constructor_null_throwsNullPointerException() {
+        assertThrows(NullPointerException.class, () -> new Skills(null));
+    }
+
+    @Test
+    public void constructor_invalidSkills_throwsIllegalArgumentException() {
+        String invalidSkills = "Coding,,Communication"; // Invalid format
+        assertThrows(IllegalArgumentException.class, () -> new Skills(invalidSkills));
+    }
+
+    @Test
+    public void constructor_validSkills_success() {
+        String validSkills = "Coding, Communication, ProblemSolving";
+        Skills skills = new Skills(validSkills);
+        assertTrue(skills.value.equals(validSkills));
+    }
+
+    @Test
+    public void isValidSkillsString() {
+        // invalid skills
+        assertFalse(Skills.isValidSkillsString("")); // empty string
+        assertFalse(Skills.isValidSkillsString(" ")); // spaces only
+        assertFalse(Skills.isValidSkillsString("Coding, , Communication")); // double commas
+        assertFalse(Skills.isValidSkillsString("A very long skill name exceeding thirty characters")); // too long
+
+        // valid skills
+        assertTrue(Skills.isValidSkillsString("Coding")); // single valid skill
+        assertTrue(Skills.isValidSkillsString("Coding, Communication")); // two valid skills
+        assertTrue(Skills.isValidSkillsString("ProblemSolving, CriticalThinking, Leadership")); // multiple valid skills
+    }
+
+    @Test
+    public void equals_sameSkills_true() {
+        Skills skills1 = new Skills("Coding, Communication");
+        Skills skills2 = new Skills("Coding, Communication");
+        assertTrue(skills1.equals(skills2));
+    }
+
+    @Test
+    public void equals_differentSkills_false() {
+        Skills skills1 = new Skills("Coding, Communication");
+        Skills skills2 = new Skills("Leadership, Teamwork");
+        assertFalse(skills1.equals(skills2));
+    }
+
+    @Test
+    public void hashCode_sameSkills_sameHashCode() {
+        Skills skills1 = new Skills("Coding, Communication");
+        Skills skills2 = new Skills("Coding, Communication");
+        assertTrue(skills1.hashCode() == skills2.hashCode());
+    }
+
+    @Test
+    public void hashCode_differentSkills_differentHashCode() {
+        Skills skills1 = new Skills("Coding, Communication");
+        Skills skills2 = new Skills("Leadership, Teamwork");
+        assertFalse(skills1.hashCode() == skills2.hashCode());
+    }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
index 9017275dee9..27c4a272e9d 100644
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
@@ -1,6 +1,7 @@
 package seedu.address.storage;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.BENSON;
@@ -16,6 +17,7 @@
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 
 public class JsonAdaptedPersonTest {
@@ -25,11 +27,13 @@ public class JsonAdaptedPersonTest {
     private static final String INVALID_EMAIL = "example.com";
     private static final String INVALID_STATUS = "Recruited";
     private static final String INVALID_TAG = "#friend";
+    private static final String INVALID_SKILLS = "123,456";
 
     private static final String VALID_NAME = BENSON.getName().toString();
     private static final String VALID_PHONE = BENSON.getPhone().toString();
     private static final String VALID_EMAIL = BENSON.getEmail().toString();
     private static final String VALID_ADDRESS = BENSON.getAddress().toString();
+    private static final String VALID_SKILLS = BENSON.getSkills().toString();
     private static final String VALID_STATUS = BENSON.getStatus().toString();
     private static final String VALID_NOTE = BENSON.getNote().toString();
     private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
@@ -45,7 +49,8 @@ public void toModelType_validPersonDetails_returnsPerson() throws Exception {
     @Test
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
+                new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        VALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = Name.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -54,8 +59,8 @@ public void toModelType_invalidName_throwsIllegalValueException() {
     @Test
     public void toModelType_nullName_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
-                        VALID_NOTE, VALID_TAGS);
+                new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        VALID_STATUS, VALID_NOTE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -63,8 +68,8 @@ public void toModelType_nullName_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidPhone_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
-                        VALID_NOTE, VALID_TAGS);
+                new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        VALID_STATUS, VALID_NOTE, VALID_TAGS);
         String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -72,7 +77,7 @@ public void toModelType_invalidPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_nullPhone_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS, VALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -81,8 +86,8 @@ public void toModelType_nullPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
-                        VALID_NOTE, VALID_TAGS);
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        VALID_STATUS, VALID_NOTE, VALID_TAGS);
         String expectedMessage = Email.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -90,7 +95,7 @@ public void toModelType_invalidEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_nullEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_SKILLS, VALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -99,7 +104,7 @@ public void toModelType_nullEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidAddress_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_SKILLS, VALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = Address.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -108,7 +113,7 @@ public void toModelType_invalidAddress_throwsIllegalValueException() {
     @Test
     public void toModelType_nullAddress_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_SKILLS, VALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -117,7 +122,8 @@ public void toModelType_nullAddress_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidStatus_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, INVALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        INVALID_STATUS,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = Status.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -126,7 +132,7 @@ public void toModelType_invalidStatus_throwsIllegalValueException() {
     @Test
     public void toModelType_nullStatus_throwsIllegalValueException() {
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, null,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS, null,
                         VALID_NOTE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Status.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
@@ -137,9 +143,33 @@ public void toModelType_invalidTags_throwsIllegalValueException() {
         List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_STATUS,
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_SKILLS,
+                        VALID_STATUS,
                         VALID_NOTE, invalidTags);
         assertThrows(IllegalValueException.class, person::toModelType);
     }
 
+    @Test
+    public void toModelType_invalidSkills_throwsIllegalValueException() {
+        JsonAdaptedPerson person =
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
+                        INVALID_SKILLS , VALID_STATUS, VALID_NOTE, VALID_TAGS);
+        String expectedMessage = Skills.MESSAGE_CONSTRAINTS;
+        assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
+    }
+
+    @Test
+    public void toModelType_nullSkills_throwsIllegalValueException() {
+        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
+                null, VALID_STATUS, VALID_NOTE, VALID_TAGS);
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Skills.class.getSimpleName());
+        assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
+    }
+
+    @Test
+    public void equals_nullObject_returnsFalse() {
+        Skills skills = new Skills("Java, Python");
+        assertFalse(skills.equals(null));
+    }
+
 }
diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
index 4e5ce9200c8..65ccbca9b39 100644
--- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
+++ b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
@@ -76,7 +76,7 @@ public void readAndSaveAddressBook_allInOrder_success() throws Exception {
         original.removePerson(ALICE);
         jsonAddressBookStorage.saveAddressBook(original, filePath);
         readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
-        assertEquals(original, new AddressBook(readBack));
+        assertEquals(new AddressBook(readBack), original);
 
         // Save and read without specifying file path
         original.addPerson(IDA);
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
index d0abab49487..9128b1f39a9 100644
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
@@ -11,6 +11,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 
@@ -38,6 +39,7 @@ public EditPersonDescriptorBuilder(Person person) {
         descriptor.setPhone(person.getPhone());
         descriptor.setEmail(person.getEmail());
         descriptor.setAddress(person.getAddress());
+        descriptor.setSkills(person.getSkills());
         descriptor.setStatus(person.getStatus());
         descriptor.setNote(person.getNote());
         descriptor.setTags(person.getTags());
@@ -75,6 +77,14 @@ public EditPersonDescriptorBuilder withAddress(String address) {
         return this;
     }
 
+    /**
+     * Sets the {@code Skills} of the {@code EditPersonDescriptor} that we are building.
+     */
+    public EditPersonDescriptorBuilder withSkills(String skills) {
+        descriptor.setSkills(new Skills(skills)); // Creates a new Skills object from the string
+        return this;
+    }
+
     /**
      * Sets the {@code Status} of the {@code EditPersonDescriptor} that we are building.
      */
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
index 42492e45d23..8f98add91c8 100644
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ b/src/test/java/seedu/address/testutil/PersonBuilder.java
@@ -9,6 +9,7 @@
 import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Skills;
 import seedu.address.model.person.Status;
 import seedu.address.model.tag.Tag;
 import seedu.address.model.util.SampleDataUtil;
@@ -22,6 +23,7 @@ public class PersonBuilder {
     public static final String DEFAULT_PHONE = "85355255";
     public static final String DEFAULT_EMAIL = "amy@gmail.com";
     public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
+    public static final String DEFAULT_SKILLS = "Java, Python";
     public static final String DEFAULT_STATUS = "Applied";
     public static final String DEFAULT_NOTE = "Knowledgeable and funny";
 
@@ -29,6 +31,7 @@ public class PersonBuilder {
     private Phone phone;
     private Email email;
     private Address address;
+    private Skills skills;
     private Status status;
     private Note note;
     private Set<Tag> tags;
@@ -41,6 +44,7 @@ public PersonBuilder() {
         phone = new Phone(DEFAULT_PHONE);
         email = new Email(DEFAULT_EMAIL);
         address = new Address(DEFAULT_ADDRESS);
+        skills = new Skills(DEFAULT_SKILLS);
         status = new Status(DEFAULT_STATUS);
         note = new Note(DEFAULT_NOTE);
         tags = new HashSet<>();
@@ -54,6 +58,7 @@ public PersonBuilder(Person personToCopy) {
         phone = personToCopy.getPhone();
         email = personToCopy.getEmail();
         address = personToCopy.getAddress();
+        skills = personToCopy.getSkills();
         status = personToCopy.getStatus();
         note = personToCopy.getNote();
         tags = new HashSet<>(personToCopy.getTags());
@@ -99,6 +104,15 @@ public PersonBuilder withEmail(String email) {
         return this;
     }
 
+    /**
+     * Sets the {@code Skills} of the {@code Person} that we are building.
+     */
+    public PersonBuilder withSkills(String skills) {
+        this.skills = new Skills(skills);
+
+        return this;
+    }
+
     /**
      * Sets the {@code Status} of the {@code Person} that we are building.
      */
@@ -116,7 +130,7 @@ public PersonBuilder withNote(String note) {
     }
 
     public Person build() {
-        return new Person(name, phone, email, address, status, note, tags);
+        return new Person(name, phone, email, address, skills, status, note, tags);
     }
 
 }
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
index 022fc8487f8..4d734ad3154 100644
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ b/src/test/java/seedu/address/testutil/PersonUtil.java
@@ -5,6 +5,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SKILLS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
@@ -15,6 +16,7 @@
 import seedu.address.model.person.Person;
 import seedu.address.model.tag.Tag;
 
+
 /**
  * A utility class for Person.
  */
@@ -36,6 +38,7 @@ public static String getPersonDetails(Person person) {
         sb.append(PREFIX_PHONE).append(person.getPhone().value).append(" ");
         sb.append(PREFIX_EMAIL).append(person.getEmail().value).append(" ");
         sb.append(PREFIX_ADDRESS).append(person.getAddress().value).append(" ");
+        sb.append(PREFIX_SKILLS).append(person.getSkills().value).append(" ");
         sb.append(PREFIX_STATUS).append(person.getStatus().value).append(" ");
         sb.append(PREFIX_NOTE).append(person.getNote().value).append(" ");
         person.getTags().forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(" "));
@@ -51,6 +54,7 @@ public static String getEditPersonDescriptorDetails(EditPersonDescriptor descrip
         descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
         descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
         descriptor.getAddress().ifPresent(address -> sb.append(PREFIX_ADDRESS).append(address.value).append(" "));
+        descriptor.getSkills().ifPresent(skills -> sb.append(PREFIX_SKILLS).append(skills.value).append(" "));
         descriptor.getStatus().ifPresent(status -> sb.append(PREFIX_STATUS).append(status.value).append(" "));
         descriptor.getNote().ifPresent(note -> sb.append(PREFIX_NOTE).append(note.value).append(" "));
         if (descriptor.getTags().isPresent()) {
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index 3c4b5f3acd8..e38f8a6a3e0 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -8,6 +8,8 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SKILLS_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SKILLS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_STATUS_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_STATUS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
@@ -27,37 +29,48 @@ public class TypicalPersons {
 
     public static final Person ALICE = new PersonBuilder().withName("Alice Pauline")
             .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
-            .withPhone("94351253").withStatus("Applied").withNote("Super Confident")
+            .withPhone("94351253").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("Super Confident")
             .withTags("friends").build();
     public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
             .withAddress("311, Clementi Ave 2, #02-25")
-            .withEmail("johnd@example.com").withPhone("98765432").withStatus("Applied")
+            .withEmail("johnd@example.com").withPhone("98765432").withSkills("DevOps, python")
+            .withStatus("Applied")
             .withNote("Dislike micro-managing")
             .withTags("owesMoney", "friends").build();
     public static final Person CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
-            .withEmail("heinz@example.com").withAddress("wall street").withStatus("Applied").withNote("").build();
+            .withEmail("heinz@example.com").withAddress("wall street").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
     public static final Person DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
-            .withEmail("cornelia@example.com").withAddress("10th street").withStatus("Applied").withNote("")
+            .withEmail("cornelia@example.com").withAddress("10th street").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("")
             .withTags("friends").build();
     public static final Person ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
-            .withEmail("werner@example.com").withAddress("michegan ave").withStatus("Applied").withNote("").build();
+            .withEmail("werner@example.com").withAddress("michegan ave").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
     public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
-            .withEmail("lydia@example.com").withAddress("little tokyo").withStatus("Applied").withNote("").build();
+            .withEmail("lydia@example.com").withAddress("little tokyo").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
     public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
-            .withEmail("anna@example.com").withAddress("4th street").withStatus("Applied").withNote("").build();
+            .withEmail("anna@example.com").withAddress("4th street").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
 
     // Manually added
     public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
-            .withEmail("stefan@example.com").withAddress("little india").withStatus("Applied").withNote("").build();
+            .withEmail("stefan@example.com").withAddress("little india").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
     public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
-            .withEmail("hans@example.com").withAddress("chicago ave").withStatus("Applied").withNote("").build();
+            .withEmail("hans@example.com").withAddress("chicago ave").withSkills("DevOps, python")
+            .withStatus("Applied").withNote("").build();
 
     // Manually added - Person's details found in {@code CommandTestUtil}
     public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
-            .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withStatus(VALID_STATUS_AMY)
+            .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withSkills(VALID_SKILLS_AMY)
+            .withStatus(VALID_STATUS_AMY)
             .withNote("Optimistic").withTags(VALID_TAG_FRIEND).build();
     public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-            .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withStatus(VALID_STATUS_BOB)
+            .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withSkills(VALID_SKILLS_BOB)
+            .withStatus(VALID_STATUS_BOB)
             .withNote("Charismatic").withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
 
     public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER