diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 59076a2020e..277d6a84948 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -120,6 +120,21 @@ Examples:
 * `teacher n/Lebron p/91234567 e/lbj@example.com a/George street, block 123, #01-01 i/Math HOD
 t/relief`
 
+### Adding a medical history to a student: `medical`
+
+Adds a medical history to an existing student in NewAddressBook.
+
+Format: `medical INDEX m/MEDICAL_HISTORY`
+
+<div markdown="span" class="alert alert-primary">:bulb: **Tip:**
+Edits the student at the specified index. The index must be a positive integer.
+To edit an existing medical history, simply use the same command, which will overwrite 
+the current medical history.
+</div>
+
+Examples:
+* `medical 1 m/ADHD`
+
 ### Listing all persons : `list`
 
 Shows a list of all persons stored in NewAddressBook.
diff --git a/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java b/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
index c6c579bfae3..34f1f7dc744 100644
--- a/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
+++ b/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
@@ -18,10 +18,14 @@
 import seedu.address.model.Model;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.FormClass;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
 
+/**
+ * Edits the fields of an existing student in the New Address Book.
+ */
 public class EditStudentCommand extends EditCommand {
     public static final String TARGET = "student";
     public static final String COMMAND_WORD = "editStudent";
@@ -60,7 +64,8 @@ private static Student createdEditedStudent(Student studentToEdit, EditStudentDe
                 editStudentDescriptor.getEmergencyContact().orElse(studentToEdit.getEmergencyContact());
         FormClass updatedFormClass = editStudentDescriptor.getFormClass().orElse(studentToEdit.getFormClass());
         Address updatedAddress = editStudentDescriptor.getAddress().orElse(studentToEdit.getAddress());
-        return new Student(person, updatedEmergencyContact, updatedFormClass, updatedAddress);
+        MedicalHistory updatedMedicalHistory = studentToEdit.getMedicalHistory(); //edit command does not edit medical
+        return new Student(person, updatedEmergencyContact, updatedFormClass, updatedAddress, updatedMedicalHistory);
     }
 
     @Override
diff --git a/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java b/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java
new file mode 100644
index 00000000000..7bfbea45887
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java
@@ -0,0 +1,101 @@
+package seedu.address.logic.commands.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.MedicalHistory;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Student;
+
+/**
+ * Changes the medical history of an existing student inside the New Address Book.
+ */
+public class MedicalHistoryCommand extends Command {
+    public static final String COMMAND_WORD = "medical";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Edits the medical history of the person identified "
+            + "by the index number used in the last person listing. "
+            + "Existing medical history will be overwritten by the input.\n"
+            + "Parameters: INDEX (must be a positive integer) "
+            + "m/ [MEDICAL_HISTORY]\n"
+            + "Example: " + COMMAND_WORD + " 1 "
+            + "m/ ADHD";
+
+    public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Medical_History: %2$s";
+    public static final String MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS = "Added medical history to Person: %1$s";
+    public static final String MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS = "Removed medical history from Person: %1$s";
+
+    private final Index index;
+    private final MedicalHistory medicalHistory;
+
+    /**
+     * @param index of the student in the filtered person list to edit the {@code MedicalHistory}
+     * @param medicalHistory of the student to be updated to
+     */
+    public MedicalHistoryCommand(Index index, MedicalHistory medicalHistory) {
+        requireAllNonNull(index, medicalHistory);
+
+        this.index = index;
+        this.medicalHistory = medicalHistory;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Person> lastShownList = model.getFilteredPersonList();
+
+        if (index.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        }
+
+        Person personToEdit = lastShownList.get(index.getZeroBased());
+        if (!(personToEdit instanceof Student)) {
+            throw new CommandException("You cannot add medical history to a teacher!");
+        }
+        Student studentToEdit = (Student) personToEdit;
+        Student editedStudent = new Student(studentToEdit, studentToEdit.getEmergencyContact(),
+            studentToEdit.getFormClass(), studentToEdit.getAddress(), medicalHistory);
+
+        model.setPerson(studentToEdit, editedStudent);
+        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        return new CommandResult(generateSuccessMessage(editedStudent));
+    }
+
+    /**
+     * Generates a command execution success message based on whether
+     * the medical history is added to or removed from
+     * {@code studentToEdit}.
+     */
+    private String generateSuccessMessage(Student studentToEdit) {
+        String message = !medicalHistory.value.isEmpty() ? MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS
+                : MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS;
+        return String.format(message, studentToEdit);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof MedicalHistoryCommand)) {
+            return false;
+        }
+
+        // state check
+        MedicalHistoryCommand e = (MedicalHistoryCommand) other;
+        return index.equals(e.index)
+                && medicalHistory.equals(e.medicalHistory);
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
index f11f25bd7ee..a36e1bda060 100644
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -17,11 +17,13 @@
 import seedu.address.logic.commands.ListCommand;
 import seedu.address.logic.commands.student.AddStudentCommand;
 import seedu.address.logic.commands.student.EditStudentCommand;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
 import seedu.address.logic.commands.teacher.AddTeacherCommand;
 import seedu.address.logic.commands.teacher.EditTeacherCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.logic.parser.student.AddStudentCommandParser;
 import seedu.address.logic.parser.student.EditStudentCommandParser;
+import seedu.address.logic.parser.student.MedicalHistoryCommandParser;
 import seedu.address.logic.parser.teacher.AddTeacherCommandParser;
 import seedu.address.logic.parser.teacher.EditTeacherCommandParser;
 
@@ -88,6 +90,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case FilterCommand.COMMAND_WORD:
             return new FilterCommandParser().parse(arguments);
 
+        case MedicalHistoryCommand.COMMAND_WORD:
+            return new MedicalHistoryCommandParser().parse(arguments);
+
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index a4ecd283558..b26bf5aa797 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -17,4 +17,5 @@ public class CliSyntax {
     public static final Prefix PREFIX_GENDER = new Prefix("g/");
     public static final Prefix PREFIX_OFFICE_TABLE = new Prefix("o/");
     public static final Prefix PREFIX_COPY_FIELD = new Prefix("c/");
+    public static final Prefix PREFIX_MEDICAL_HISTORY = new Prefix("m/");
 }
diff --git a/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java b/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
index 73b2e958132..0ee018880db 100644
--- a/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
@@ -67,10 +67,8 @@ public AddStudentCommand parse(String args) throws ParseException {
         Phone emergencyContact = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_EMERGENCY_CONTACT).get());
         FormClass formClass = ParserUtil.parseFormClass(argMultimap.getValue(PREFIX_FORM_CLASS).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-
         Student student = new Student(name, phone, email, gender, involvement, address, emergencyContact, formClass,
                 tagList);
-
         return new AddStudentCommand(student);
     }
 }
diff --git a/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java b/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java
new file mode 100644
index 00000000000..6e43b05419b
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java
@@ -0,0 +1,45 @@
+package seedu.address.logic.parser.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEDICAL_HISTORY;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.MedicalHistory;
+
+/**
+ * Parses input arguments and creates a new {@code MedicalHistoryCommand} object.
+ */
+public class MedicalHistoryCommandParser implements Parser<MedicalHistoryCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the MedicalHistoryCommand
+     * and returns an MedicalHistoryCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public MedicalHistoryCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
+                PREFIX_MEDICAL_HISTORY);
+
+        Index index;
+        try {
+            index = ParserUtil.parseIndex(argMultimap.getPreamble());
+        } catch (IllegalValueException ive) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    MedicalHistoryCommand.MESSAGE_USAGE), ive);
+        }
+
+        String medicalHistory = argMultimap.getValue(PREFIX_MEDICAL_HISTORY).orElse("");
+
+        return new MedicalHistoryCommand(index, new MedicalHistory(medicalHistory));
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/teacher/AddTeacherCommandParser.java b/src/main/java/seedu/address/logic/parser/teacher/AddTeacherCommandParser.java
index 5e458e5dff6..b4aca96db33 100644
--- a/src/main/java/seedu/address/logic/parser/teacher/AddTeacherCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/teacher/AddTeacherCommandParser.java
@@ -68,7 +68,6 @@ public AddTeacherCommand parse(String args) throws ParseException {
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
         Teacher teacher = new Teacher(name, phone, email, gender, involvement, tableNumber, tagList);
-
         return new AddTeacherCommand(teacher);
     }
 }
diff --git a/src/main/java/seedu/address/model/person/MedicalHistory.java b/src/main/java/seedu/address/model/person/MedicalHistory.java
new file mode 100644
index 00000000000..fcfbc39a880
--- /dev/null
+++ b/src/main/java/seedu/address/model/person/MedicalHistory.java
@@ -0,0 +1,38 @@
+package seedu.address.model.person;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Represents a Student's medical history in the address book.
+ * Guarantees: immutable; is always valid
+ */
+public class MedicalHistory {
+    public final String value;
+
+    /**
+     * Constructs a {@code MedicalHistory}.
+     *
+     * @param medicalHistory A medicalHistory.
+     */
+    public MedicalHistory(String medicalHistory) {
+        requireNonNull(medicalHistory);
+        value = medicalHistory;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof MedicalHistory // instanceof handles nulls
+                && value.equals(((MedicalHistory) other).value)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+}
diff --git a/src/main/java/seedu/address/model/person/Student.java b/src/main/java/seedu/address/model/person/Student.java
index 430b16c77d4..753e0d89ba1 100644
--- a/src/main/java/seedu/address/model/person/Student.java
+++ b/src/main/java/seedu/address/model/person/Student.java
@@ -10,12 +10,13 @@
  */
 public class Student extends Person {
 
-    private final Phone emergencyContact;
-    private final FormClass formClass;
-    private final Address address;
+    private Phone emergencyContact;
+    private FormClass formClass;
+    private Address address;
+    private MedicalHistory medicalHistory;
 
     /**
-     * Constructor for {@code Student}
+     * Constructor for {@code Student} with every fields present
      * @param name Name of student
      * @param phone Phone number of student
      * @param email Email of student
@@ -25,14 +26,15 @@ public class Student extends Person {
      * @param emergencyContact Emergency contact of student
      * @param formClass Form Class of Student
      * @param tags Tags associated to student
+     * @param medicalHistory   Medical History of student
      */
-
     public Student(Name name, Phone phone, Email email, Gender gender, Involvement involvement, Address address,
-                   Phone emergencyContact, FormClass formClass, Set<Tag> tags) {
+                   Phone emergencyContact, FormClass formClass, Set<Tag> tags, MedicalHistory medicalHistory) {
         super(name, phone, email, gender, involvement, tags);
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
         this.address = address;
+        this.medicalHistory = medicalHistory;
     }
 
     /**
@@ -42,14 +44,26 @@ public Student(Name name, Phone phone, Email email, Gender gender, Involvement i
      * @param emergencyContact Emergency contact of student
      * @param formClass Form Class of Student
      * @param address Address of student
+     * @param medicalHistory Medical History of student
      */
-
-    public Student(Person person, Phone emergencyContact, FormClass formClass, Address address) {
+    public Student(Person person, Phone emergencyContact, FormClass formClass,
+                   Address address, MedicalHistory medicalHistory) {
         super(person.getName(), person.getPhone(), person.getEmail(), person.getGender(), person.getInvolvement(),
-                person.getTags());
+            person.getTags());
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
         this.address = address;
+        this.medicalHistory = medicalHistory;
+    }
+
+    /**
+     * Constructor for {@code Student} without medical history
+     *
+     */
+    public Student(Name name, Phone phone, Email email, Gender gender, Involvement involvement, Address address,
+                   Phone emergencyContact, FormClass formClass, Set<Tag> tags) {
+        this(name, phone, email, gender, involvement, address,
+                emergencyContact, formClass, tags, new MedicalHistory(""));
     }
 
     public Phone getEmergencyContact() {
@@ -64,6 +78,10 @@ public Address getAddress() {
         return this.address;
     }
 
+    public MedicalHistory getMedicalHistory() {
+        return this.medicalHistory;
+    }
+
     /**
      * Returns true if both person are students, and have the same identity and data fields.
      * This defines a stronger notion of equality between two students.
@@ -82,13 +100,19 @@ public boolean equals(Object other) {
         return super.equals(otherStudent)
                 && this.getEmergencyContact().equals(otherStudent.getEmergencyContact())
                 && this.getFormClass().equals(otherStudent.getFormClass())
-                && this.getAddress().equals(otherStudent.getAddress());
+                && this.getAddress().equals(otherStudent.getAddress())
+                && this.getMedicalHistory().equals(otherStudent.getMedicalHistory());
     }
 
     @Override
     public String toString() {
-        return super.toString() + "; " + String.format("Emergency contact: %s", getEmergencyContact())
+        return super.toString() + "; "
+                + String.format("Emergency contact: %s", getEmergencyContact())
+                + "; "
                 + String.format("Form class: %s", getFormClass())
-                + String.format("Address: %s", getAddress());
+                + "; "
+                + String.format("Address: %s", getAddress())
+                + "; "
+                + String.format("Medical History: %s", getMedicalHistory());
     }
 }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedStudent.java b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
index 99a175d7b31..ee6f934a6f1 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
@@ -14,6 +14,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -29,6 +30,7 @@ class JsonAdaptedStudent extends JsonAdaptedPerson {
     private final String address;
     private final String emergencyContact;
     private final String formClass;
+    private final String medicalHistory;
 
     /**
      * Constructs a {@code JsonAdaptedStudent} with the given student details.
@@ -40,11 +42,13 @@ public JsonAdaptedStudent(@JsonProperty("name") String name, @JsonProperty("phon
                               @JsonProperty("address") String address,
                               @JsonProperty("emergencyContact") String emergencyContact,
                               @JsonProperty("formClass") String formClass,
+                              @JsonProperty("medicalHistory") String medicalHistory,
                               @JsonProperty("tagged") List<JsonAdaptedTag> tagged) {
         super(name, phone, email, gender, involvement, tagged);
         this.address = address;
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
+        this.medicalHistory = medicalHistory;
     }
 
     /**
@@ -55,6 +59,7 @@ public JsonAdaptedStudent(Student source) {
         this.address = source.getAddress().value;
         this.emergencyContact = source.getEmergencyContact().value;
         this.formClass = source.getFormClass().value;
+        this.medicalHistory = source.getMedicalHistory().value;
     }
 
     /**
@@ -136,8 +141,15 @@ public Student toModelType() throws IllegalValueException {
         }
         final FormClass modelFormClass = new FormClass(formClass);
 
+        if (medicalHistory == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+                MedicalHistory.class.getSimpleName()));
+        }
+        final MedicalHistory modelMedicalHistory = new MedicalHistory(medicalHistory);
+
+
         final Set<Tag> modelTags = new HashSet<>(studentTags);
         return new Student(modelName, modelPhone, modelEmail, modelGender, modelInvolvement,
-                modelAddress, modelEmergencyContact, modelFormClass, modelTags);
+                modelAddress, modelEmergencyContact, modelFormClass, modelTags, modelMedicalHistory);
     }
 }
diff --git a/src/main/java/seedu/address/ui/StudentCard.java b/src/main/java/seedu/address/ui/StudentCard.java
index 6a17ad798e2..6f1fe98c362 100644
--- a/src/main/java/seedu/address/ui/StudentCard.java
+++ b/src/main/java/seedu/address/ui/StudentCard.java
@@ -48,6 +48,8 @@ public class StudentCard extends UiPart<Region> {
     private Label formClass;
     @FXML
     private Label gender;
+    @FXML
+    private Label medicalHistory;
 
     /**
      * Creates a {@code PersonCode} with the given {@code Person} and index to display.
@@ -62,11 +64,12 @@ public StudentCard(Student student, int displayedIndex) {
         email.setText(student.getEmail().value);
         formClass.setText(student.getFormClass().value);
         gender.setText(student.getGender().value);
+        medicalHistory.setText(student.getMedicalHistory().value);
         involvement.setText(student.getInvolvement().involvement);
-        student.getTags().stream()
-                .sorted(Comparator.comparing(tag -> tag.tagName))
-                .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
         emergencyContact.setText(student.getEmergencyContact().value);
+        student.getTags().stream()
+            .sorted(Comparator.comparing(tag -> tag.tagName))
+            .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
     }
 
     @Override
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index b0064e289d2..1bb66d0ad14 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -32,6 +32,7 @@
          <HBox prefHeight="0.0" prefWidth="130.0">
             <children>
             <Label fx:id="formClass" styleClass="cell_small_label" text="\$formClass" />
+            <Label fx:id="medicalHistory" styleClass="cell_small_label" text="\$medicalHistory" />
             <Label fx:id="involvement" styleClass="cell_small_label" text="\$involvement">
                   <HBox.margin>
                      <Insets left="4.0" />
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
index f66aaa3d978..bccb9bd2eaf 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
@@ -7,7 +7,8 @@
     "involvement": "Math class",
     "address": "4th street",
     "emergencyContact" : "95614132",
-    "formClass" : "4E1"
+    "formClass" : "4E1",
+    "medicalHistory" : ""
   }, {
     "name": "Student With Invalid Phone Field",
     "phone": "948asdf2424",
@@ -16,7 +17,8 @@
     "involvement": "Math class",
     "address": "4th street",
     "emergencyContact" : "95614132",
-    "formClass" : "4E1"
+    "formClass" : "4E1",
+    "medicalHistory" : ""
   } ],
   "teachers": [ {
     "name": "Valid Teacher",
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
index 1708d00d59a..b291af6a350 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
@@ -7,7 +7,8 @@
     "involvement": "Math class",
     "address": "4th street",
     "emergencyContact" : "95614132",
-    "formClass" : "4E1"
+    "formClass" : "4E1",
+    "medicalHistory" : ""
   } ],
   "teachers": [ {
     "name": "Teacher with invalid name field: Ha!ns Mu@ster",
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
index ef1d544e03f..c501ab758bc 100644
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
@@ -8,6 +8,7 @@
     "address": "123, Jurong West Ave 6, #08-111",
     "emergencyContact" : "95614132",
     "formClass" : "4E1",
+    "medicalHistory": "",
     "tagged": [ "friends" ]
   }, {
     "name": "Alice Pauline",
@@ -17,7 +18,8 @@
     "involvement": "Math class",
     "address": "123, Jurong West Ave 6, #08-111",
     "emergencyContact" : "95614132",
-    "formClass" : "4E1"
+    "formClass" : "4E1",
+    "medicalHistory" : ""
   } ],
   "teachers": [ {
     "name": "Alice Pauline",
@@ -34,6 +36,5 @@
     "gender": "F",
     "involvement": "Math HOD",
     "officeTable": "1"
-
   } ]
 }
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 46c142baf38..8f5140327c8 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -9,6 +9,7 @@
     "address" : "123, Jurong West Ave 6, #08-111",
     "emergencyContact" : "95614132",
     "formClass" : "4N1",
+    "medicalHistory" : "ADHD",
     "tagged" : [ "friends" ]
   }, {
     "name" : "Benson Meier",
@@ -19,6 +20,7 @@
     "address" : "311, Clementi Ave 2, #02-25",
     "emergencyContact" : "91939100",
     "formClass" : "3E3",
+    "medicalHistory" : "Autistic",
     "tagged" : [ "owesMoney", "friends" ]
   }, {
     "name" : "Carl Kurz",
@@ -29,6 +31,7 @@
     "address" : "wall street",
     "emergencyContact" : "48190514",
     "formClass" : "4E2",
+    "medicalHistory" : "",
     "tagged" : [ ]
   }, {
     "name" : "Daniel Meier",
@@ -39,6 +42,7 @@
     "address" : "10th street",
     "emergencyContact" : "58141834",
     "formClass" : "4E2",
+    "medicalHistory" : "",
     "tagged" : [ "friends" ]
   }, {
     "name" : "Elle Meyer",
@@ -49,6 +53,7 @@
     "address" : "michegan ave",
     "emergencyContact" : "92329700",
     "formClass" : "4E2",
+    "medicalHistory" : "",
     "tagged" : [ ]
   }, {
     "name" : "Fiona Kunz",
@@ -59,6 +64,7 @@
     "address" : "little tokyo",
     "emergencyContact" : "580947918074907019749087",
     "formClass" : "1T1",
+    "medicalHistory" : "",
     "tagged" : [ ]
   }, {
     "name" : "George Best",
@@ -69,6 +75,7 @@
     "address" : "4th street",
     "emergencyContact" : "84041748901",
     "formClass" : "1T1",
+    "medicalHistory" : "",
     "tagged" : [ ]
   } ],
   "teachers" : [ {
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index ed9903b6af8..6eee2569c09 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -65,7 +65,8 @@ public class CommandTestUtil {
     public static final String VALID_GENDER_DEE = "N";
     public static final String VALID_OFFICE_TABLE_CHO = "4";
     public static final String VALID_OFFICE_TABLE_DEE = "12";
-
+    public static final String VALID_MEDICAL_HISTORY_AMY = "ADHD";
+    public static final String VALID_MEDICAL_HISTORY_BOB = "Autistic";
     public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
     public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
     public static final String NAME_DESC_CHO = " " + PREFIX_NAME + VALID_NAME_CHO;
diff --git a/src/test/java/seedu/address/logic/commands/student/EditStudentCommandTest.java b/src/test/java/seedu/address/logic/commands/student/EditStudentCommandTest.java
index 1e30c1cf05f..d1ac0ca446c 100644
--- a/src/test/java/seedu/address/logic/commands/student/EditStudentCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/student/EditStudentCommandTest.java
@@ -39,15 +39,15 @@ public class EditStudentCommandTest {
     @Test
     public void execute_allFieldsSpecifiedUnfilteredList_success() {
         // check if all fields can be edited
-        Student editedStudent = new StudentBuilder().build();
+        Student editedStudent = new StudentBuilder().buildForEdit();
         EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder(editedStudent).build();
         EditStudentCommand editStudentCommand = new EditStudentCommand(INDEX_FIRST_STUDENT, descriptor);
 
         String expectedMessage = String.format(EditStudentCommand.MESSAGE_EDIT_STUDENT_SUCCESS, editedStudent);
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        System.out.println(model.getFilteredPersonList().get(0));
         expectedModel.setPerson(model.getFilteredPersonList().get(0), editedStudent);
-
         assertCommandSuccess(editStudentCommand, model, expectedMessage, expectedModel);
     }
 
diff --git a/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java b/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java
new file mode 100644
index 00000000000..98c1e88f24a
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java
@@ -0,0 +1,139 @@
+package seedu.address.logic.commands.student;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEDICAL_HISTORY_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEDICAL_HISTORY_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_STUDENT;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_STUDENT;
+import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.person.MedicalHistory;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Student;
+import seedu.address.testutil.StudentBuilder;
+
+class MedicalHistoryCommandTest {
+    private static final String MEDICAL_HISTORY_STUB = "Some medical history";
+    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+
+    @Test
+    public void execute_addMedicalHistoryUnfilteredList_success() {
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_STUDENT.getZeroBased());
+        StudentBuilder personInList = new StudentBuilder((Student) firstPerson);
+        Student editedStudent = personInList.withMedicalHistory(MEDICAL_HISTORY_STUB).build();
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(editedStudent.getMedicalHistory().value));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_deleteMedicalHistoryUnfilteredList_success() {
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_STUDENT.getZeroBased());
+        Student editedStudent = new StudentBuilder((Student) firstPerson).withMedicalHistory("").build();
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(editedStudent.getMedicalHistory().toString()));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_filteredList_success() {
+        showPersonAtIndex(model, INDEX_FIRST_STUDENT);
+
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_STUDENT.getZeroBased());
+        Student editedStudent = new StudentBuilder((Student) model.getFilteredPersonList().get(INDEX_FIRST_STUDENT
+                .getZeroBased())).withMedicalHistory(MEDICAL_HISTORY_STUB).build();
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(editedStudent.getMedicalHistory().value));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_invalidPersonIndexUnfilteredList_failure() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(outOfBoundIndex,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB));
+
+        assertCommandFailure(medicalHistoryCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+    }
+
+    /**
+     * Edit filtered list where index is larger than size of filtered list,
+     * but smaller than size of address book
+     */
+    @Test
+    public void execute_invalidPersonIndexFilteredList_failure() {
+        showPersonAtIndex(model, INDEX_FIRST_STUDENT);
+        Index outOfBoundIndex = INDEX_SECOND_STUDENT;
+        // ensures that outOfBoundIndex is still in bounds of address book list
+        assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(outOfBoundIndex,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB));
+
+        assertCommandFailure(medicalHistoryCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void equals() {
+        final MedicalHistoryCommand standardCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY));
+
+        // same values -> returns true
+        MedicalHistoryCommand commandWithSameValues = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY));
+        assertTrue(standardCommand.equals(commandWithSameValues));
+
+        // same object -> returns true
+        assertTrue(standardCommand.equals(standardCommand));
+
+        // null -> returns false
+        assertFalse(standardCommand.equals(null));
+
+        // different types -> returns false
+        assertFalse(standardCommand.equals(new ClearCommand()));
+
+        // different index -> returns false
+        assertFalse(standardCommand.equals(new MedicalHistoryCommand(INDEX_SECOND_STUDENT,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY))));
+
+        // different MedicalHistory -> returns false
+        assertFalse(standardCommand.equals(new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB))));
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
index af6fe5cfe0f..47a6d5c8c7d 100644
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEDICAL_HISTORY;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_STUDENT;
 
@@ -22,7 +23,9 @@
 import seedu.address.logic.commands.descriptors.EditStudentDescriptor;
 import seedu.address.logic.commands.student.AddStudentCommand;
 import seedu.address.logic.commands.student.EditStudentCommand;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 import seedu.address.model.person.Student;
 import seedu.address.testutil.EditStudentDescriptorBuilder;
@@ -34,7 +37,7 @@ public class AddressBookParserTest {
     private final AddressBookParser parser = new AddressBookParser();
 
     @Test
-    public void parseCommand_student() throws Exception {
+    public void parseCommand_addStudent() throws Exception {
         Student student = new StudentBuilder().build();
         AddStudentCommand command = (AddStudentCommand) parser.parseCommand(StudentUtil.getStudentCommand(student));
         assertEquals(new AddStudentCommand(student), command);
@@ -88,6 +91,15 @@ public void parseCommand_list() throws Exception {
         assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
     }
 
+    @Test
+    public void parseCommand_medical() throws Exception {
+        final MedicalHistory medicalHistory = new MedicalHistory("ADHD");
+        MedicalHistoryCommand command = (MedicalHistoryCommand) parser.parseCommand(
+                MedicalHistoryCommand.COMMAND_WORD + " "
+                + INDEX_FIRST_STUDENT.getOneBased() + " " + PREFIX_MEDICAL_HISTORY + medicalHistory.value);
+        assertEquals(new MedicalHistoryCommand(INDEX_FIRST_STUDENT, medicalHistory), command);
+    }
+
     @Test
     public void parseCommand_unrecognisedInput_throwsParseException() {
         assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
diff --git a/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java b/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java
new file mode 100644
index 00000000000..c477890ac2f
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java
@@ -0,0 +1,44 @@
+package seedu.address.logic.parser.student;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEDICAL_HISTORY;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_STUDENT;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
+import seedu.address.model.person.MedicalHistory;
+
+public class MedicalHistoryCommandParserTest {
+    private MedicalHistoryCommandParser parser = new MedicalHistoryCommandParser();
+    private final String nonEmptyMedicalHistory = "Some MedicalHistory.";
+
+    @Test
+    public void parse_indexSpecified_success() {
+        // have MedicalHistory
+        Index targetIndex = INDEX_FIRST_STUDENT;
+        String userInput = targetIndex.getOneBased() + " " + PREFIX_MEDICAL_HISTORY + nonEmptyMedicalHistory;
+        MedicalHistoryCommand expectedCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT,
+                new MedicalHistory(nonEmptyMedicalHistory));
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // no MedicalHistory
+        userInput = targetIndex.getOneBased() + " " + PREFIX_MEDICAL_HISTORY;
+        expectedCommand = new MedicalHistoryCommand(INDEX_FIRST_STUDENT, new MedicalHistory(""));
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_missingCompulsoryField_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, MedicalHistoryCommand.MESSAGE_USAGE);
+
+        // no parameters
+        assertParseFailure(parser, MedicalHistoryCommand.COMMAND_WORD, expectedMessage);
+
+        // no index
+        assertParseFailure(parser, MedicalHistoryCommand.COMMAND_WORD + " " + nonEmptyMedicalHistory, expectedMessage);
+    }
+}
diff --git a/src/test/java/seedu/address/model/person/MedicalHistoryTest.java b/src/test/java/seedu/address/model/person/MedicalHistoryTest.java
new file mode 100644
index 00000000000..c761936037e
--- /dev/null
+++ b/src/test/java/seedu/address/model/person/MedicalHistoryTest.java
@@ -0,0 +1,31 @@
+package seedu.address.model.person;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class MedicalHistoryTest {
+
+    @Test
+    public void testEquals() {
+        MedicalHistory medicalHistory = new MedicalHistory("ADHD");
+
+        // same object -> returns true
+        assertTrue(medicalHistory.equals(medicalHistory));
+
+        // same values -> returns true
+        MedicalHistory medicalHistoryCopy = new MedicalHistory(medicalHistory.value);
+        assertTrue(medicalHistory.equals(medicalHistoryCopy));
+
+        // different types -> returns false
+        assertFalse(medicalHistory.equals(1));
+
+        // null -> returns false
+        assertFalse(medicalHistory.equals(null));
+
+        // different MedicalHistory -> returns false
+        MedicalHistory differentMedicalHistory = new MedicalHistory("Autism");
+        assertFalse(medicalHistory.equals(differentMedicalHistory));
+    }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
index dcea383b2d8..1f5f4823777 100644
--- a/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
+++ b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
@@ -17,6 +17,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 
@@ -37,20 +38,23 @@ public class JsonAdaptedStudentTest {
     private static final String VALID_INVOLVEMENT = BENSON.getInvolvement().toString();
     private static final String VALID_FORM_CLASS = BENSON.getFormClass().toString();
     private static final String VALID_GENDER = BENSON.getGender().toString();
+    private static final String VALID_MEDICAL_HISTORY = BENSON.getMedicalHistory().toString();
     private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
         .map(JsonAdaptedTag::new)
         .collect(Collectors.toList());
 
+
     @Test
     public void toModelType_validStudentDetails_returnsStudent() throws Exception {
-        JsonAdaptedStudent person = new JsonAdaptedStudent(BENSON);
-        assertEquals(BENSON, person.toModelType());
+        JsonAdaptedStudent student = new JsonAdaptedStudent(BENSON);
+        assertEquals(BENSON, student.toModelType());
     }
 
     @Test
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Name.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -58,7 +62,8 @@ public void toModelType_invalidName_throwsIllegalValueException() {
     @Test
     public void toModelType_nullName_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(null, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -66,7 +71,8 @@ public void toModelType_nullName_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidPhone_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -74,7 +80,8 @@ public void toModelType_invalidPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_nullPhone_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, null, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -82,7 +89,8 @@ public void toModelType_nullPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidEmail_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Email.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -90,7 +98,8 @@ public void toModelType_invalidEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_nullEmail_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, null, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -98,7 +107,8 @@ public void toModelType_nullEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidAddress_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, INVALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, INVALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Address.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -106,7 +116,8 @@ public void toModelType_invalidAddress_throwsIllegalValueException() {
     @Test
     public void toModelType_nullAddress_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, null, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, null, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -114,7 +125,8 @@ public void toModelType_nullAddress_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidInvolvement_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                INVALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                INVALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Involvement.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -122,7 +134,8 @@ public void toModelType_invalidInvolvement_throwsIllegalValueException() {
     @Test
     public void toModelType_nullInvolvement_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                null, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                null, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Involvement.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -131,15 +144,16 @@ public void toModelType_nullInvolvement_throwsIllegalValueException() {
     public void toModelType_invalidTags_throwsIllegalValueException() {
         List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
+
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, invalidTags);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, invalidTags);
         assertThrows(IllegalValueException.class, student::toModelType);
     }
 
     @Test
     public void toModelType_invalidEmergencyContact_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
         String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -147,7 +161,8 @@ public void toModelType_invalidEmergencyContact_throwsIllegalValueException() {
     @Test
     public void toModelType_nullEmergencyContact_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, null, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, null,
+                VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -155,7 +170,8 @@ public void toModelType_nullEmergencyContact_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidFormClass_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, INVALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, INVALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = FormClass.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -163,7 +179,8 @@ public void toModelType_invalidFormClass_throwsIllegalValueException() {
     @Test
     public void toModelType_nullFormClass_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, null, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, null, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, FormClass.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -171,7 +188,8 @@ public void toModelType_nullFormClass_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidGender_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_GENDER,
-                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = Gender.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -179,9 +197,18 @@ public void toModelType_invalidGender_throwsIllegalValueException() {
     @Test
     public void toModelType_nullGender_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, null,
-                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_TAGS);
+                VALID_INVOLVEMENT, VALID_ADDRESS, INVALID_PHONE, VALID_FORM_CLASS, VALID_MEDICAL_HISTORY, VALID_TAGS);
+
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Gender.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
 
+    @Test
+    public void toModelType_nullMedicalHistory_throwsIllegalValueException() {
+        JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_GENDER,
+            VALID_INVOLVEMENT, VALID_ADDRESS, VALID_PHONE, VALID_FORM_CLASS, null, VALID_TAGS);
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, MedicalHistory.class.getSimpleName());
+        assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+    }
+
 }
diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
index 5a6bca5c92b..b7f7ad84451 100644
--- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
+++ b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
@@ -27,8 +27,6 @@ public void toModelType_typicalPersonsFile_success() throws Exception {
                 JsonSerializableAddressBook.class).get();
         AddressBook addressBookFromFile = dataFromFile.toModelType();
         AddressBook typicalPersonsAddressBook = TypicalPersons.getTypicalAddressBook();
-        System.out.println(addressBookFromFile.getPersonList());
-        System.out.println(typicalPersonsAddressBook.getPersonList());
         assertEquals(addressBookFromFile, typicalPersonsAddressBook);
     }
 
diff --git a/src/test/java/seedu/address/testutil/StudentBuilder.java b/src/test/java/seedu/address/testutil/StudentBuilder.java
index aa97446904f..addff7ec9a7 100644
--- a/src/test/java/seedu/address/testutil/StudentBuilder.java
+++ b/src/test/java/seedu/address/testutil/StudentBuilder.java
@@ -8,6 +8,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -27,6 +28,7 @@ public class StudentBuilder {
     public static final String DEFAULT_INVOLVEMENT = "Math class";
     public static final String DEFAULT_FORM_CLASS = "4E1";
     public static final String DEFAULT_GENDER = "M";
+    public static final String DEFAULT_MEDICAL_HISTORY = "";
 
     private Name name;
     private Phone phone;
@@ -37,6 +39,7 @@ public class StudentBuilder {
     private Phone emergencyContact;
     private FormClass formClass;
     private Gender gender;
+    private MedicalHistory medicalHistory;
 
     /**
      * Creates a {@code StudentBuilder} with the default details.
@@ -51,6 +54,7 @@ public StudentBuilder() {
         emergencyContact = new Phone(DEFAULT_EMERGENCY_CONTACT);
         formClass = new FormClass(DEFAULT_FORM_CLASS);
         gender = new Gender(DEFAULT_GENDER);
+        medicalHistory = new MedicalHistory(DEFAULT_MEDICAL_HISTORY);
     }
 
     /**
@@ -66,6 +70,7 @@ public StudentBuilder(Student studentToCopy) {
         emergencyContact = studentToCopy.getEmergencyContact();
         formClass = studentToCopy.getFormClass();
         gender = studentToCopy.getGender();
+        medicalHistory = studentToCopy.getMedicalHistory();
     }
 
     /**
@@ -142,8 +147,30 @@ public StudentBuilder withGender(String gender) {
         return this;
     }
 
+    /**
+     * Sets the {@code MedicalHistory} of the {@code Student} that we are building.
+     */
+    public StudentBuilder withMedicalHistory(String medicalHistory) {
+        this.medicalHistory = new MedicalHistory(medicalHistory);
+        return this;
+    }
+
+    /**
+     * Builds the {@code Student}.
+     * @return the student.
+     */
     public Student build() {
-        return new Student(name, phone, email, gender, involvement, address, emergencyContact, formClass, tags);
+        return new Student(name, phone, email, gender, involvement, address,
+            emergencyContact, formClass, tags, medicalHistory);
+    }
+
+    /**
+     * Builds the {@code Student} for edit tests.
+     * @return the student.
+     */
+    public Student buildForEdit() {
+        return new Student(name, phone, email, gender, involvement, address,
+            emergencyContact, formClass, tags, new MedicalHistory("ADHD"));
     }
 
 }
diff --git a/src/test/java/seedu/address/testutil/StudentUtil.java b/src/test/java/seedu/address/testutil/StudentUtil.java
index f2092f42609..a27e4a84b21 100644
--- a/src/test/java/seedu/address/testutil/StudentUtil.java
+++ b/src/test/java/seedu/address/testutil/StudentUtil.java
@@ -26,25 +26,25 @@ public class StudentUtil {
      * Returns an add command string for adding the {@code student}.
      */
     public static String getStudentCommand(Student student) {
-        return AddStudentCommand.COMMAND_WORD + " " + getPersonDetails(student);
+        return AddStudentCommand.COMMAND_WORD + " " + getStudentDetails(student);
     }
 
     /**
      * Returns the part of command string for the given {@code person}'s details.
      */
-    public static String getPersonDetails(Student student) {
+    public static String getStudentDetails(Student student) {
         StringBuilder sb = new StringBuilder();
         sb.append(PREFIX_NAME + student.getName().fullName + " ");
         sb.append(PREFIX_PHONE + student.getPhone().value + " ");
         sb.append(PREFIX_EMAIL + student.getEmail().value + " ");
-        sb.append(PREFIX_ADDRESS + student.getAddress().value + " ");
+        sb.append(PREFIX_GENDER + student.getGender().value + " ");
         sb.append(PREFIX_INVOLVEMENT + student.getInvolvement().involvement + " ");
+        sb.append(PREFIX_ADDRESS + student.getAddress().value + " ");
+        sb.append(PREFIX_EMERGENCY_CONTACT + student.getEmergencyContact().value + " ");
+        sb.append(PREFIX_FORM_CLASS + student.getFormClass().value + " ");
         student.getTags().stream().forEach(
             s -> sb.append(PREFIX_TAG + s.tagName + " ")
         );
-        sb.append(PREFIX_EMERGENCY_CONTACT + student.getEmergencyContact().value + " ");
-        sb.append(PREFIX_FORM_CLASS + student.getFormClass().value + " ");
-        sb.append(PREFIX_GENDER + student.getGender().value + " ");
         return sb.toString();
     }
 
@@ -56,15 +56,15 @@ public static String getEditStudentDescriptorDetails(EditStudentDescriptor descr
         descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
         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.getGender().ifPresent(genders -> sb.append(PREFIX_GENDER).append(genders.value).append(" "));
         descriptor.getInvolvement().ifPresent(involvement -> sb.append(PREFIX_INVOLVEMENT)
                 .append(involvement.involvement).append(" "));
+        descriptor.getAddress().ifPresent(address -> sb.append(PREFIX_ADDRESS).append(address.value).append(" "));
         descriptor.getEmergencyContact().ifPresent(emergencyContact ->
                 sb.append(PREFIX_EMERGENCY_CONTACT).append(emergencyContact.value).append(" "));
         descriptor.getFormClass().ifPresent(formClass ->
                 sb.append(PREFIX_FORM_CLASS).append(formClass.value).append(" "));
-        descriptor.getGender().ifPresent(genders ->
-                sb.append(PREFIX_GENDER).append(genders.value).append(" "));
+
         // tags should be the last, else bug
         if (descriptor.getTags().isPresent()) {
             Set<Tag> tags = descriptor.getTags().get();
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index 8a440d69df7..e19f6d147b7 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -54,6 +54,7 @@ public class TypicalPersons {
             .withInvolvement("Math class")
             .withFormClass("4N1")
             .withGender("F")
+            .withMedicalHistory("ADHD")
             .build();
     public static final Student BENSON = new StudentBuilder()
             .withName("Benson Meier")
@@ -65,6 +66,7 @@ public class TypicalPersons {
             .withInvolvement("Math class")
             .withFormClass("3E3")
             .withGender("M")
+            .withMedicalHistory("Autistic")
             .build();
     public static final Student CARL = new StudentBuilder()
             .withName("Carl Kurz")
@@ -75,6 +77,7 @@ public class TypicalPersons {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
     public static final Student DANIEL = new StudentBuilder()
             .withName("Daniel Meier")
@@ -86,6 +89,7 @@ public class TypicalPersons {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
     public static final Student ELLE = new StudentBuilder()
             .withName("Elle Meyer")
@@ -96,6 +100,7 @@ public class TypicalPersons {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
     public static final Student FIONA = new StudentBuilder()
             .withName("Fiona Kunz")
@@ -106,6 +111,7 @@ public class TypicalPersons {
             .withInvolvement("English class")
             .withFormClass("1T1")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
     public static final Student GEORGE = new StudentBuilder()
             .withName("George Best")
@@ -116,6 +122,7 @@ public class TypicalPersons {
             .withInvolvement("English class")
             .withFormClass("1T1")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
 
     public static final Teacher ALI = new TeacherBuilder()
@@ -194,6 +201,7 @@ public class TypicalPersons {
             .withInvolvement("English rep")
             .withFormClass("3E2")
             .withGender("N")
+            .withMedicalHistory("")
             .build();
 
     public static final Student IDA = new StudentBuilder()
@@ -205,6 +213,7 @@ public class TypicalPersons {
             .withInvolvement("Bio rep")
             .withFormClass("2T1")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
 
     // Manually added - Person's details found in {@code CommandTestUtil}
@@ -218,6 +227,7 @@ public class TypicalPersons {
             .withEmergencyContact(VALID_EMERGENCY_CONTACT_AMY)
             .withFormClass(VALID_FORM_CLASS_AMY)
             .withGender(VALID_GENDER_AMY)
+            .withMedicalHistory("")
             .build();
 
     public static final Student BOB = new StudentBuilder()
@@ -230,6 +240,7 @@ public class TypicalPersons {
             .withEmergencyContact(VALID_EMERGENCY_CONTACT_BOB)
             .withFormClass(VALID_FORM_CLASS_BOB)
             .withGender(VALID_GENDER_BOB)
+            .withMedicalHistory("")
             .build();
 
     public static final Teacher CHO = new TeacherBuilder()