diff --git a/.github/workflows/telegram-alerts.yml b/.github/workflows/telegram-alerts.yml
new file mode 100644
index 00000000000..ba70310d6f6
--- /dev/null
+++ b/.github/workflows/telegram-alerts.yml
@@ -0,0 +1,17 @@
+name: Telegram Pull Request Notifier
+
+on:
+  pull_request:
+    types: [opened, review_requested]
+
+jobs:
+  notification:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Send a telegram message on pr open or review request
+      - name: Pull Request Telegram
+        uses: F2had/pr-telegram-action@v1.0.0
+        with:
+          bot_token: '${{ secrets.BOTTOKEN }}'
+          chat_id: '${{ secrets.CHATID }}'
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index a64c326f1d0..76f917b0e5e 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -83,7 +83,7 @@ in [`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main
 <puml src="diagrams/UiClassDiagram.puml" alt="Structure of the UI Component"/>
 
 The UI consists of a `MainWindow` that is made up of parts
-e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`,
+e.g.`CommandBox`, `ResultDisplay`, `ContactListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`,
 inherit from the abstract `UiPart` class which captures the commonalities between classes that represent parts of the
 visible GUI.
 
@@ -98,7 +98,7 @@ The `UI` component,
 * executes user commands using the `Logic` component.
 * listens for changes to `Model` data so that the UI can be updated with the modified data.
 * keeps a reference to the `Logic` component, because the `UI` relies on the `Logic` to execute commands.
-* depends on some classes in the `Model` component, as it displays `Person` object residing in the `Model`.
+* depends on some classes in the `Model` component, as it displays `Contact` object residing in the `Model`.
 
 ### Logic component
 
@@ -122,7 +122,7 @@ PlantUML, the lifeline continues till the end of diagram.
 
 How the `Logic` component works:
 
-1. When `Logic` is called upon to execute a command, it is passed to an `AddressBookParser` object which in turn creates
+1. When `Logic` is called upon to execute a command, it is passed to an `CodeConnectParser` object which in turn creates
    a parser that matches the command (e.g., `DeleteCommandParser`) and uses it to parse the command.
 1. This results in a `Command` object (more precisely, an object of one of its subclasses e.g., `DeleteCommand`) which
    is executed by the `LogicManager`.
@@ -137,9 +137,9 @@ Here are the other classes in `Logic` (omitted from the class diagram above) tha
 
 How the parsing works:
 
-* When called upon to parse a user command, the `AddressBookParser` class creates an `XYZCommandParser` (`XYZ` is a
+* When called upon to parse a user command, the `CodeConnectParser` class creates an `XYZCommandParser` (`XYZ` is a
   placeholder for the specific command name e.g., `AddCommandParser`) which uses the other classes shown above to parse
-  the user command and create a `XYZCommand` object (e.g., `AddCommand`) which the `AddressBookParser` returns back as
+  the user command and create a `XYZCommand` object (e.g., `AddCommand`) which the `CodeConnectParser` returns back as
   a `Command` object.
 * All `XYZCommandParser` classes (e.g., `AddCommandParser`, `DeleteCommandParser`, ...) inherit from the `Parser`
   interface so that they can be treated similarly where possible e.g, during testing.
@@ -154,9 +154,9 @@ in [`Model.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/m
 
 The `Model` component,
 
-* stores the address book data i.e., all `Person` objects (which are contained in a `UniquePersonList` object).
-* stores the currently 'selected' `Person` objects (e.g., results of a search query) as a separate _filtered_ list which
-  is exposed to outsiders as an unmodifiable `ObservableList<Person>` that can be 'observed' e.g. the UI can be bound to
+* stores the address book data i.e., all `Contact` objects (which are contained in a `UniqueContactList` object).
+* stores the currently 'selected' `Contact` objects (e.g., results of a search query) as a separate _filtered_ list which
+  is exposed to outsiders as an unmodifiable `ObservableList<Contact>` that can be 'observed' e.g. the UI can be bound to
   this list so that the UI automatically updates when the data in the list change.
 * stores a `UserPref` object that represents the user’s preferences. This is exposed to the outside as
   a `ReadOnlyUserPref` objects.
@@ -165,9 +165,11 @@ The `Model` component,
 
 <box type="info" seamless>
 
-**Note:** An alternative (arguably, a more OOP) model is given below. It has a `Tag` list in the `AddressBook`,
-which `Person` references. This allows `AddressBook` to only require one `Tag` object per unique tag, instead of
-each `Person` needing their own `Tag` objects.<br>
+**Note:** An alternative (arguably, a more OOP) model is given below. It has a `Tag` list in the `CodeConnect`,
+which `Contact` references. This allows `CodeConnect
+
+` to only require one `Tag` object per unique tag, instead of
+each `Contact` needing their own `Tag` objects.<br>
 
 <puml src="diagrams/BetterModelClassDiagram.puml" width="450" />
 
@@ -184,14 +186,14 @@ The `Storage` component,
 
 * can save both address book data and user preference data in JSON format, and read them back into corresponding
   objects.
-* inherits from both `AddressBookStorage` and `UserPrefStorage`, which means it can be treated as either one (if only
+* inherits from both `CodeConnectStorage` and `UserPrefStorage`, which means it can be treated as either one (if only
   the functionality of only one is needed).
 * depends on some classes in the `Model` component (because the `Storage` component's job is to save/retrieve objects
   that belong to the `Model`)
 
 ### Common classes
 
-Classes used by multiple components are in the `seedu.addressbook.commons` package.
+Classes used by multiple components are in the `seedu.address.commons` package.
 
 --------------------------------------------------------------------------------------------------------------------
 
@@ -221,46 +223,46 @@ the command is executed:
 
 #### Proposed Implementation 
 
-The proposed undo/redo mechanism is facilitated by `VersionedAddressBook`. It extends `AddressBook` with an undo/redo
-history, stored internally as an `addressBookStateList` and `currentStatePointer`. Additionally, it implements the
+The proposed undo/redo mechanism is facilitated by `VersionedCodeConnect`. It extends `CodeConnect` with an undo/redo
+history, stored internally as `codeConnectStateList` and `currentStatePointer`. Additionally, it implements the
 following operations:
 
-* `VersionedAddressBook#commit()` — Saves the current address book state in its history.
-* `VersionedAddressBook#undo()` — Restores the previous address book state from its history.
-* `VersionedAddressBook#redo()` — Restores a previously undone address book state from its history.
+* `VersionedCodeConnect#commit()` — Saves the current address book state in its history.
+* `VersionedCodeConnect#undo()` — Restores the previous address book state from its history.
+* `VersionedCodeConnect#redo()` — Restores a previously undone address book state from its history.
 
-These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()`
-and `Model#redoAddressBook()` respectively.
+These operations are exposed in the `Model` interface as `Model#commitCodeConnect()`, `Model#undoCodeConnect()`
+and `Model#redoCodeConnect()` respectively.
 
 Given below is an example usage scenario and how the undo/redo mechanism behaves at each step.
 
-Step 1. The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the
+Step 1. The user launches the application for the first time. The `VersionedCodeConnect` will be initialized with the
 initial address book state, and the `currentStatePointer` pointing to that single address book state.
 
 <puml src="diagrams/UndoRedoState0.puml" alt="UndoRedoState0" />
 
 Step 2. The user executes `delete 5` command to delete the 5th contact in the address book. The `delete` command
-calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete 5` command executes
-to be saved in the `addressBookStateList`, and the `currentStatePointer` is shifted to the newly inserted address book
+calls `Model#commitCodeConnect()`, causing the modified state of the address book after the `delete 5` command executes
+to be saved in the `codeConnectStateList`, and the `currentStatePointer` is shifted to the newly inserted address book
 state.
 
 <puml src="diagrams/UndoRedoState1.puml" alt="UndoRedoState1" />
 
 Step 3. The user executes `add n/David …​` to add a new contact. The `add` command also
-calls `Model#commitAddressBook()`, causing another modified address book state to be saved into
-the `addressBookStateList`.
+calls `Model#commitCodeConnect()`, causing another modified address book state to be saved into
+the `codeConnectStateList`.
 
 <puml src="diagrams/UndoRedoState2.puml" alt="UndoRedoState2" />
 
 <box type="info" seamless>
 
-**Note:** If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will
-not be saved into the `addressBookStateList`.
+**Note:** If a command fails its execution, it will not call `Model#commitCodeConnect()`, so the address book state will
+not be saved into the `codeConnectStateList`.
 
 </box>
 
 Step 4. The user now decides that adding the contact was a mistake, and decides to undo that action by executing
-the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer`
+the `undo` command. The `undo` command will call `Model#undoCodeConnect()`, which will shift the `currentStatePointer`
 once to the left, pointing it to the previous address book state, and restores the address book to that state.
 
 <puml src="diagrams/UndoRedoState3.puml" alt="UndoRedoState3" />
@@ -268,8 +270,8 @@ once to the left, pointing it to the previous address book state, and restores t
 
 <box type="info" seamless>
 
-**Note:** If the `currentStatePointer` is at index 0, pointing to the initial AddressBook state, then there are no
-previous AddressBook states to restore. The `undo` command uses `Model#canUndoAddressBook()` to check if this is the
+**Note:** If the `currentStatePointer` is at index 0, pointing to the initial CodeConnect state, then there are no
+previous CodeConnect states to restore. The `undo` command uses `Model#canUndoCodeConnect()` to check if this is the
 case. If so, it will return an error to the user rather
 than attempting to perform the undo.
 
@@ -290,24 +292,24 @@ Similarly, how an undo operation goes through the `Model` component is shown bel
 
 <puml src="diagrams/UndoSequenceDiagram-Model.puml" alt="UndoSequenceDiagram-Model" />
 
-The `redo` command does the opposite — it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state.
+The `redo` command does the opposite — it calls `Model#redoCodeConnect()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state.
 
 <box type="info" seamless>
 
-**Note:** If the `currentStatePointer` is at index `addressBookStateList.size() - 1`, pointing to the latest address
-book state, then there are no undone AddressBook states to restore. The `redo` command uses `Model#canRedoAddressBook()`
+**Note:** If the `currentStatePointer` is at index `codeConnectStateList.size() - 1`, pointing to the latest address
+book state, then there are no undone CodeConnect states to restore. The `redo` command uses `Model#canRedoCodeConnect()`
 to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo.
 
 </box>
 
 Step 5. The user then decides to execute the command `list`. Commands that do not modify the address book, such
-as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`.
-Thus, the `addressBookStateList` remains unchanged.
+as `list`, will usually not call `Model#commitCodeConnect()`, `Model#undoCodeConnect()` or `Model#redoCodeConnect()`.
+Thus, the `codeConnectStateList` remains unchanged.
 
 <puml src="diagrams/UndoRedoState4.puml" alt="UndoRedoState4" />
 
-Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Since the `currentStatePointer` is not
-pointing at the end of the `addressBookStateList`, all address book states after the `currentStatePointer` will be
+Step 6. The user executes `clear`, which calls `Model#commitCodeConnect()`. Since the `currentStatePointer` is not
+pointing at the end of the `codeConnectStateList`, all address book states after the `currentStatePointer` will be
 purged. Reason: It no longer makes sense to redo the `add n/David …​` command. This is the behavior that most modern
 desktop applications follow.
 
@@ -400,7 +402,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
 
 ### Use cases
 
-(For all use cases below, the **System** is the `AddressBook` and the **Actor** is the `user`, unless specified otherwise)
+(For all use cases below, the **System** is the `CodeConnect` and the **Actor** is the `user`, unless specified otherwise)
 
 **Use case: UC01 - Delete a contact**
 
@@ -508,7 +510,27 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
     * 1b1. CodeConnect shows an empty list.
       Use case ends.
 
-**Use case: UC07 - Sending an email to a specific contact**
+**Use case: UC07 - Search a contact by tech stack**
+
+**MSS**
+
+1. User requests to look up contacts with specific tech stack.
+2. CodeConnect checks each contact’s tech stack in the list.
+3. CodeConnect shows a list of contacts that match the criteria.
+
+   Use case ends.
+
+**Extensions**
+
+* 1a. No tech stack is given.
+    * 1a1. CodeConnect shows an error message.
+      Use case ends.
+
+* 1b. There are no contacts in the list that match the criteria.
+    * 1b1. CodeConnect shows an empty list.
+      Use case ends. 
+
+**Use case: UC08 - Sending an email to a specific contact**
 
 **MSS**
 
@@ -523,6 +545,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
 
 * 1a. The default desktop mail application is not available on the system.
     * 1a1. CodeConnect displays an error message indicating that the desktop mail application is not supported.
+
       Use case ends.
 
 *{More to be added}*
diff --git a/docs/SettingUp.md b/docs/SettingUp.md
index 03df0295bd2..47c1b22ce81 100644
--- a/docs/SettingUp.md
+++ b/docs/SettingUp.md
@@ -51,7 +51,7 @@ If you plan to use Intellij IDEA (highly recommended):
 
 1. **Learn the design**
 
-   When you are ready to start coding, we recommend that you get some sense of the overall design by reading about [AddressBook’s architecture](DeveloperGuide.md#architecture).
+   When you are ready to start coding, we recommend that you get some sense of the overall design by reading about [CodeConnect’s architecture](DeveloperGuide.md#architecture).
 
 1. **Do the tutorials**
    These tutorials will help you get acquainted with the codebase.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 16390f15acd..cb5bcbfcdb2 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -17,11 +17,11 @@ CodeConnect (CC) is a **desktop app for managing student contacts, optimized for
 
 1. Ensure you have Java `11` or above installed in your Computer.
 
-1. Download the latest `addressbook.jar` from [here](https://github.com/se-edu/addressbook-level3/releases).
+1. Download the latest `codeconnect.jar` from [here](https://github.com/se-edu/addressbook-level3/releases).
 
-1. Copy the file to the folder you want to use as the _home folder_ for your AddressBook.
+1. Copy the file to the folder you want to use as the _home folder_ for your CodeConnect.
 
-1. Open a command terminal, `cd` into the folder you put the jar file in, and use the `java -jar addressbook.jar` command to run the application.<br>
+1. Open a command terminal, `cd` into the folder you put the jar file in, and use the `java -jar codeconnect.jar` command to run the application.<br>
    A GUI similar to the below should appear in a few seconds. Note how the app contains some sample data.<br>
    ![Ui](images/Ui.png)
 
@@ -150,6 +150,20 @@ Examples:
 - image to be replaced
   ![result for 'find alex david'](images/findAlexDavidResult.png)
 
+#### Locating contacts by tech stack: `find-ts`
+
+Finds contacts whose tech stack contain all the given keywords.
+
+Format: `find-ts KEYWORD [MORE_KEYWORDS]`
+
+- The search is case-insensitive. e.g `java` will match `Java`
+- Only the tech stack are searched.
+- Only full words will be matched e.g. `java` will not match `javascript`
+- contacts matching all keywords will be returned (i.e. `AND` search).
+
+Examples:
+- image to be inserted
+
 #### Deleting a contact : `delete`
 
 Deletes the specified contact from the address book.
@@ -196,20 +210,20 @@ to refer to it, and then return back to your edited command to finish typing.
 
 #### Saving the data
 
-AddressBook data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually.
+CodeConnect data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually.
 
 #### Editing the data file
 
-AddressBook data are saved automatically as a JSON file `[JAR file location]/data/addressbook.json`. Advanced users are welcome to update data directly by editing that data file.
+CodeConnect data are saved automatically as a JSON file `[JAR file location]/data/addressbook.json`. Advanced users are welcome to update data directly by editing that data file.
 
 <box type="warning" seamless>
 
 **Caution:**
-If your changes to the data file makes its format invalid, AddressBook will discard all data and start with an empty data file at the next run. Hence, it is recommended to take a backup of the file before editing it.<br>
-Furthermore, certain edits can cause the AddressBook to behave in unexpected ways (e.g., if a value entered is outside the acceptable range). Therefore, edit the data file only if you are confident that you can update it correctly.
+If your changes to the data file makes its format invalid, CodeConnect will discard all data and start with an empty data file at the next run. Hence, it is recommended to take a backup of the file before editing it.<br>
+Furthermore, certain edits can cause the CodeConnect to behave in unexpected ways (e.g., if a value entered is outside the acceptable range). Therefore, edit the data file only if you are confident that you can update it correctly.
 </box>
 
-### Archiving data files `[coming in v2.0]`
+#### Archiving data files `[coming in v2.0]`
 
 _Details coming soon ..._
 
@@ -218,7 +232,7 @@ _Details coming soon ..._
 ## FAQ
 
 **Q**: How do I transfer my data to another Computer?<br>
-**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous AddressBook home folder.
+**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous CodeConnect home folder.
 
 ---
 
@@ -230,13 +244,15 @@ _Details coming soon ..._
 
 ## Command summary
 
-| Action            | Format, Examples                                                                                                                                                                                                                    |
-|-------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Add**           | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS g/GITHUB_USERNAME [t/TAG] [ts/TECH_STACK]…​` <br> e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 g/Jamesho123 t/friend t/colleague ts/Java ts/C++` |
-| **Clear**         | `clear`                                                                                                                                                                                                                             |
-| **Delete**        | `delete INDEX`<br> e.g., `delete 3`                                                                                                                                                                                                 |
-| **Edit**          | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [g/GITHUB_USERNAME] [t/TAG]…​ [ts/TECH_STACK]…​ `<br> e.g.,`edit 2 n/James Lee e/jameslee@example.com`                                                                  |
-| **Find by Names** | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake`                                                                                                                                                                          |
-| **Find by Tags**  | `find-tags KEYWORD [MORE_KEYWORDS]`<br> e.g., `find-tags School Work`                                                                                                                                                               |
-| **List**          | `list`                                                                                                                                                                                                                              |
-| **Help**          | `help`                                                                                                                                                                                                                              |
+
+| Action              | Format, Examples                                                                                                                                                                                                                    |
+|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Add**             | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS g/GITHUB_USERNAME [t/TAG] [ts/TECH_STACK]…​` <br> e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 g/Jamesho123 t/friend t/colleague ts/Java ts/C++` |
+| **Clear**           | `clear`                                                                                                                                                                                                                             |
+| **Delete**          | `delete INDEX`<br> e.g., `delete 3`                                                                                                                                                                                                 |
+| **Edit**            | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [g/GITHUB_USERNAME] [t/TAG]…​ [ts/TECH_STACK]…​ `<br> e.g.,`edit 2 n/James Lee e/jameslee@example.com`                                                                  |
+| **Find**            | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake`                                                                                                                                                                          |
+| **Find by Tags**    | `find-tags KEYWORD [MORE_KEYWORDS]`<br> e.g., `find-tags School Work`                                                                                                                                                               |
+| **Find Tech Stack** | `find-ts KEYWORD [MORE_KEYWORDS]`<br> e.g., `find-ts Java Python`                                                                                                                                                                   |
+| **List**            | `list`                                                                                                                                                                                                                              |
+| **Help**            | `help`                                                                                                                                                                                                                              |
diff --git a/docs/diagrams/BetterModelClassDiagram.puml b/docs/diagrams/BetterModelClassDiagram.puml
index 598474a5c82..7116311899b 100644
--- a/docs/diagrams/BetterModelClassDiagram.puml
+++ b/docs/diagrams/BetterModelClassDiagram.puml
@@ -4,18 +4,18 @@ skinparam arrowThickness 1.1
 skinparam arrowColor MODEL_COLOR
 skinparam classBackgroundColor MODEL_COLOR
 
-AddressBook *-right-> "1" UniquePersonList
-AddressBook *-right-> "1" UniqueTagList
-UniqueTagList -[hidden]down- UniquePersonList
-UniqueTagList -[hidden]down- UniquePersonList
+CodeConnect *-right-> "1" UniqueContactList
+CodeConnect *-right-> "1" UniqueTagList
+UniqueTagList -[hidden]down- UniqueContactList
+UniqueTagList -[hidden]down- UniqueContactList
 
 UniqueTagList -right-> "*" Tag
-UniquePersonList -right-> Person
+UniqueContactList -right-> Contact
 
-Person -up-> "*" Tag
+Contact -up-> "*" Tag
 
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
+Contact *--> Name
+Contact *--> Phone
+Contact *--> Email
+Contact *--> Address
 @enduml
diff --git a/docs/diagrams/CommitActivityDiagram.puml b/docs/diagrams/CommitActivityDiagram.puml
index 8c0892d6a70..39dc781c0ac 100644
--- a/docs/diagrams/CommitActivityDiagram.puml
+++ b/docs/diagrams/CommitActivityDiagram.puml
@@ -8,10 +8,10 @@ start
 'Since the beta syntax does not support placing the condition outside the
 'diamond we place it as the true branch instead.
 
-if () then ([command commits AddressBook])
+if () then ([command commits CodeConnect])
     :Purge redundant states;
-    :Save AddressBook to
-    addressBookStateList;
+    :Save CodeConnect to
+    CodeConnectStateList;
 else ([else])
 endif
 stop
diff --git a/docs/diagrams/DeleteSequenceDiagram.puml b/docs/diagrams/DeleteSequenceDiagram.puml
index 5241e79d7da..a470f4dafeb 100644
--- a/docs/diagrams/DeleteSequenceDiagram.puml
+++ b/docs/diagrams/DeleteSequenceDiagram.puml
@@ -4,7 +4,7 @@ skinparam ArrowFontStyle plain
 
 box Logic LOGIC_COLOR_T1
 participant ":LogicManager" as LogicManager LOGIC_COLOR
-participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":CodeConnectParser" as CodeConnectParser LOGIC_COLOR
 participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
 participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
 participant "r:CommandResult" as CommandResult LOGIC_COLOR
@@ -17,17 +17,17 @@ end box
 [-> LogicManager : execute("delete 1")
 activate LogicManager
 
-LogicManager -> AddressBookParser : parseCommand("delete 1")
-activate AddressBookParser
+LogicManager -> CodeConnectParser : parseCommand("delete 1")
+activate CodeConnectParser
 
 create DeleteCommandParser
-AddressBookParser -> DeleteCommandParser
+CodeConnectParser -> DeleteCommandParser
 activate DeleteCommandParser
 
-DeleteCommandParser --> AddressBookParser
+DeleteCommandParser --> CodeConnectParser
 deactivate DeleteCommandParser
 
-AddressBookParser -> DeleteCommandParser : parse("1")
+CodeConnectParser -> DeleteCommandParser : parse("1")
 activate DeleteCommandParser
 
 create DeleteCommand
@@ -37,19 +37,19 @@ activate DeleteCommand
 DeleteCommand --> DeleteCommandParser :
 deactivate DeleteCommand
 
-DeleteCommandParser --> AddressBookParser : d
+DeleteCommandParser --> CodeConnectParser : d
 deactivate DeleteCommandParser
 'Hidden arrow to position the destroy marker below the end of the activation bar.
-DeleteCommandParser -[hidden]-> AddressBookParser
+DeleteCommandParser -[hidden]-> CodeConnectParser
 destroy DeleteCommandParser
 
-AddressBookParser --> LogicManager : d
-deactivate AddressBookParser
+CodeConnectParser --> LogicManager : d
+deactivate CodeConnectParser
 
 LogicManager -> DeleteCommand : execute(m)
 activate DeleteCommand
 
-DeleteCommand -> Model : deletePerson(1)
+DeleteCommand -> Model : deleteContact(1)
 activate Model
 
 Model --> DeleteCommand
diff --git a/docs/diagrams/FindTechStackSequenceDiagram.puml b/docs/diagrams/FindTechStackSequenceDiagram.puml
new file mode 100644
index 00000000000..a355d0eb043
--- /dev/null
+++ b/docs/diagrams/FindTechStackSequenceDiagram.puml
@@ -0,0 +1,70 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":CodeConnectParser" as CodeConnectParser LOGIC_COLOR
+participant ":FindTechStackCommandParser" as FindTechStackCommandParser LOGIC_COLOR
+participant "fts:FindTechStackCommand" as FindTechStackCommand LOGIC_COLOR
+participant "r:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "m:Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute("find-ts Java")
+activate LogicManager
+
+LogicManager -> CodeConnectParser : parseCommand("find-ts Java")
+activate CodeConnectParser
+
+create FindTechStackCommandParser
+CodeConnectParser -> FindTechStackCommandParser
+activate FindTechStackCommandParser
+
+FindTechStackCommandParser --> CodeConnectParser
+deactivate FindTechStackCommandParser
+
+CodeConnectParser -> FindTechStackCommandParser : parse("Java")
+activate FindTechStackCommandParser
+
+create FindTechStackCommand
+FindTechStackCommandParser -> FindTechStackCommand
+activate FindTechStackCommand
+
+FindTechStackCommand --> FindTechStackCommandParser :
+deactivate FindTechStackCommand
+
+FindTechStackCommandParser --> CodeConnectParser : fts
+deactivate FindTechStackCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+FindTechStackCommandParser -[hidden]-> CodeConnectParser
+destroy FindTechStackCommandParser
+
+CodeConnectParser --> LogicManager : fts
+deactivate CodeConnectParser
+
+LogicManager -> FindTechStackCommand : execute(m)
+activate FindTechStackCommand
+
+FindTechStackCommand -> Model : updateFilteredContactList(predicate)
+activate Model
+
+Model --> FindTechStackCommand
+deactivate Model
+
+create CommandResult
+FindTechStackCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> FinTechStackCommand
+deactivate CommandResult
+
+FindTechStackCommand --> LogicManager : r
+deactivate FindTechStackCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml
index 0de5673070d..23f495cfa57 100644
--- a/docs/diagrams/ModelClassDiagram.puml
+++ b/docs/diagrams/ModelClassDiagram.puml
@@ -5,20 +5,21 @@ skinparam arrowColor MODEL_COLOR
 skinparam classBackgroundColor MODEL_COLOR
 
 Package Model as ModelPackage <<Rectangle>>{
-Class "<<interface>>\nReadOnlyAddressBook" as ReadOnlyAddressBook
+Class "<<interface>>\nReadOnlyCodeConnect" as ReadOnlyCodeConnect
 Class "<<interface>>\nReadOnlyUserPrefs" as ReadOnlyUserPrefs
 Class "<<interface>>\nModel" as Model
-Class AddressBook
+Class CodeConnect
 Class ModelManager
 Class UserPrefs
 
-Class UniquePersonList
-Class Person
+Class UniqueContactList
+Class Contact
 Class Address
 Class Email
 Class Name
 Class Phone
 Class Tag
+Class TechStack
 
 Class I #FFFFFF
 }
@@ -26,29 +27,30 @@ Class I #FFFFFF
 Class HiddenOutside #FFFFFF
 HiddenOutside ..> Model
 
-AddressBook .up.|> ReadOnlyAddressBook
+CodeConnect .up.|> ReadOnlyCodeConnect
 
 ModelManager .up.|> Model
 Model .right.> ReadOnlyUserPrefs
-Model .left.> ReadOnlyAddressBook
-ModelManager -left-> "1" AddressBook
+Model .left.> ReadOnlyCodeConnect
+ModelManager -left-> "1" CodeConnect
 ModelManager -right-> "1" UserPrefs
 UserPrefs .up.|> ReadOnlyUserPrefs
 
-AddressBook *--> "1" UniquePersonList
-UniquePersonList --> "~* all" Person
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
-Person *--> "*" Tag
+CodeConnect *--> "1" UniqueContactList
+UniqueContactList --> "~* all" Contact
+Contact *--> Name
+Contact *--> Phone
+Contact *--> Email
+Contact *--> Address
+Contact *--> "*" Tag
+Contact *--> "*" Tech Stack
 
-Person -[hidden]up--> I
-UniquePersonList -[hidden]right-> I
+Contact -[hidden]up--> I
+UniqueContactList -[hidden]right-> I
 
 Name -[hidden]right-> Phone
 Phone -[hidden]right-> Address
 Address -[hidden]right-> Email
 
-ModelManager --> "~* filtered" Person
+ModelManager --> "~* filtered" Contact
 @enduml
diff --git a/docs/diagrams/ParserClasses.puml b/docs/diagrams/ParserClasses.puml
index ce4c5ce8c8d..b4d6292961d 100644
--- a/docs/diagrams/ParserClasses.puml
+++ b/docs/diagrams/ParserClasses.puml
@@ -9,7 +9,7 @@ Class XYZCommand
 
 package "Parser classes"{
 Class "<<interface>>\nParser" as Parser
-Class AddressBookParser
+Class CodeConnectParser
 Class XYZCommandParser
 Class CliSyntax
 Class ParserUtil
@@ -19,12 +19,12 @@ Class Prefix
 }
 
 Class HiddenOutside #FFFFFF
-HiddenOutside ..> AddressBookParser
+HiddenOutside ..> CodeConnectParser
 
-AddressBookParser .down.> XYZCommandParser: <<create>>
+CodeConnectParser .down.> XYZCommandParser: <<create>>
 
 XYZCommandParser ..> XYZCommand : <<create>>
-AddressBookParser ..> Command : <<use>>
+CodeConnectParser ..> Command : <<use>>
 XYZCommandParser .up.|> Parser
 XYZCommandParser ..> ArgumentMultimap
 XYZCommandParser ..> ArgumentTokenizer
diff --git a/docs/diagrams/StorageClassDiagram.puml b/docs/diagrams/StorageClassDiagram.puml
index a821e06458c..4a582668a0b 100644
--- a/docs/diagrams/StorageClassDiagram.puml
+++ b/docs/diagrams/StorageClassDiagram.puml
@@ -14,11 +14,11 @@ Class JsonUserPrefsStorage
 Class "<<interface>>\nStorage" as Storage
 Class StorageManager
 
-package "AddressBook Storage" #F4F6F6{
-Class "<<interface>>\nAddressBookStorage" as AddressBookStorage
-Class JsonAddressBookStorage
-Class JsonSerializableAddressBook
-Class JsonAdaptedPerson
+package "CodeConnect Storage" #F4F6F6{
+Class "<<interface>>\nCodeConnectStorage" as CodeConnectStorage
+Class JsonCodeConnectStorage
+Class JsonSerializableCodeConnect
+Class JsonAdaptedContact
 Class JsonAdaptedTag
 }
 
@@ -29,15 +29,15 @@ HiddenOutside ..> Storage
 
 StorageManager .up.|> Storage
 StorageManager -up-> "1" UserPrefsStorage
-StorageManager -up-> "1" AddressBookStorage
+StorageManager -up-> "1" CodeConnectStorage
 
 Storage -left-|> UserPrefsStorage
-Storage -right-|> AddressBookStorage
+Storage -right-|> CodeConnectStorage
 
 JsonUserPrefsStorage .up.|> UserPrefsStorage
-JsonAddressBookStorage .up.|> AddressBookStorage
-JsonAddressBookStorage ..> JsonSerializableAddressBook
-JsonSerializableAddressBook --> "*" JsonAdaptedPerson
-JsonAdaptedPerson --> "*" JsonAdaptedTag
+JsonCodeConnectStorage .up.|> CodeConnectStorage
+JsonCodeConnectStorage ..> JsonSerializableCodeConnect
+JsonSerializableCodeConnect --> "*" JsonAdaptedContact
+JsonAdaptedContact --> "*" JsonAdaptedTag
 
 @enduml
diff --git a/docs/diagrams/UiClassDiagram.puml b/docs/diagrams/UiClassDiagram.puml
index 95473d5aa19..5bf258bfe82 100644
--- a/docs/diagrams/UiClassDiagram.puml
+++ b/docs/diagrams/UiClassDiagram.puml
@@ -11,8 +11,8 @@ Class UiManager
 Class MainWindow
 Class HelpWindow
 Class ResultDisplay
-Class PersonListPanel
-Class PersonCard
+Class ContactListPanel
+Class ContactCard
 Class StatusBarFooter
 Class CommandBox
 }
@@ -32,26 +32,26 @@ UiManager .left.|> Ui
 UiManager -down-> "1" MainWindow
 MainWindow *-down->  "1" CommandBox
 MainWindow *-down-> "1" ResultDisplay
-MainWindow *-down-> "1" PersonListPanel
+MainWindow *-down-> "1" ContactListPanel
 MainWindow *-down-> "1" StatusBarFooter
 MainWindow --> "0..1" HelpWindow
 
-PersonListPanel -down-> "*" PersonCard
+ContactListPanel -down-> "*" ContactCard
 
 MainWindow -left-|> UiPart
 
 ResultDisplay --|> UiPart
 CommandBox --|> UiPart
-PersonListPanel --|> UiPart
-PersonCard --|> UiPart
+ContactListPanel --|> UiPart
+ContactCard --|> UiPart
 StatusBarFooter --|> UiPart
 HelpWindow --|> UiPart
 
-PersonCard ..> Model
+ContactCard ..> Model
 UiManager -right-> Logic
 MainWindow -left-> Logic
 
-PersonListPanel -[hidden]left- HelpWindow
+ContactListPanel -[hidden]left- HelpWindow
 HelpWindow -[hidden]left- CommandBox
 CommandBox -[hidden]left- ResultDisplay
 ResultDisplay -[hidden]left- StatusBarFooter
diff --git a/docs/diagrams/UndoRedoState0.puml b/docs/diagrams/UndoRedoState0.puml
index 43a45903ac9..651d4dee573 100644
--- a/docs/diagrams/UndoRedoState0.puml
+++ b/docs/diagrams/UndoRedoState0.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title Initial state
 
 package States {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab2:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab2:CodeConnect</u>"
 }
 State1 -[hidden]right-> State2
 State2 -[hidden]right-> State3
diff --git a/docs/diagrams/UndoRedoState1.puml b/docs/diagrams/UndoRedoState1.puml
index 5a41e9e1651..1bfb18a7713 100644
--- a/docs/diagrams/UndoRedoState1.puml
+++ b/docs/diagrams/UndoRedoState1.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title After command "delete 5"
 
 package States <<rectangle>> {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab2:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab2:CodeConnect</u>"
 }
 
 State1 -[hidden]right-> State2
diff --git a/docs/diagrams/UndoRedoState2.puml b/docs/diagrams/UndoRedoState2.puml
index ad32fce1b0b..a4331110974 100644
--- a/docs/diagrams/UndoRedoState2.puml
+++ b/docs/diagrams/UndoRedoState2.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title After command "add n/David"
 
 package States <<rectangle>> {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab2:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab2:CodeConnect</u>"
 }
 
 State1 -[hidden]right-> State2
diff --git a/docs/diagrams/UndoRedoState3.puml b/docs/diagrams/UndoRedoState3.puml
index 9187a690036..37e35dcd61a 100644
--- a/docs/diagrams/UndoRedoState3.puml
+++ b/docs/diagrams/UndoRedoState3.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title After command "undo"
 
 package States <<rectangle>> {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab2:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab2:CodeConnect</u>"
 }
 
 State1 -[hidden]right-> State2
diff --git a/docs/diagrams/UndoRedoState4.puml b/docs/diagrams/UndoRedoState4.puml
index 2bc631ffcd0..6b03fbcf93d 100644
--- a/docs/diagrams/UndoRedoState4.puml
+++ b/docs/diagrams/UndoRedoState4.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title After command "list"
 
 package States <<rectangle>> {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab2:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab2:CodeConnect</u>"
 }
 
 State1 -[hidden]right-> State2
diff --git a/docs/diagrams/UndoRedoState5.puml b/docs/diagrams/UndoRedoState5.puml
index e77b04104aa..b9f94c27ad6 100644
--- a/docs/diagrams/UndoRedoState5.puml
+++ b/docs/diagrams/UndoRedoState5.puml
@@ -7,9 +7,9 @@ skinparam ClassBackgroundColor #FFFFAA
 title After command "clear"
 
 package States <<rectangle>> {
-    class State1 as "<u>ab0:AddressBook</u>"
-    class State2 as "<u>ab1:AddressBook</u>"
-    class State3 as "<u>ab3:AddressBook</u>"
+    class State1 as "<u>ab0:CodeConnect</u>"
+    class State2 as "<u>ab1:CodeConnect</u>"
+    class State3 as "<u>ab3:CodeConnect</u>"
 }
 
 State1 -[hidden]right-> State2
diff --git a/docs/diagrams/UndoSequenceDiagram-Logic.puml b/docs/diagrams/UndoSequenceDiagram-Logic.puml
index e57368c5159..5b29b331995 100644
--- a/docs/diagrams/UndoSequenceDiagram-Logic.puml
+++ b/docs/diagrams/UndoSequenceDiagram-Logic.puml
@@ -4,7 +4,7 @@ skinparam ArrowFontStyle plain
 
 box Logic LOGIC_COLOR_T1
 participant ":LogicManager" as LogicManager LOGIC_COLOR
-participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":CodeConnectParser" as CodeConnectParser LOGIC_COLOR
 participant "u:UndoCommand" as UndoCommand LOGIC_COLOR
 end box
 
@@ -14,23 +14,23 @@ end box
 [-> LogicManager : execute(undo)
 activate LogicManager
 
-LogicManager -> AddressBookParser : parseCommand(undo)
-activate AddressBookParser
+LogicManager -> CodeConnectParser : parseCommand(undo)
+activate CodeConnectParser
 
 create UndoCommand
-AddressBookParser -> UndoCommand
+CodeConnectParser -> UndoCommand
 activate UndoCommand
 
-UndoCommand --> AddressBookParser
+UndoCommand --> CodeConnectParser
 deactivate UndoCommand
 
-AddressBookParser --> LogicManager : u
-deactivate AddressBookParser
+CodeConnectParser --> LogicManager : u
+deactivate CodeConnectParser
 
 LogicManager -> UndoCommand : execute()
 activate UndoCommand
 
-UndoCommand -> Model : undoAddressBook()
+UndoCommand -> Model : undoCodeConnect()
 activate Model
 
 Model --> UndoCommand
diff --git a/docs/diagrams/UndoSequenceDiagram-Model.puml b/docs/diagrams/UndoSequenceDiagram-Model.puml
index 54d83208cb8..c3594d6f0c4 100644
--- a/docs/diagrams/UndoSequenceDiagram-Model.puml
+++ b/docs/diagrams/UndoSequenceDiagram-Model.puml
@@ -4,18 +4,18 @@ skinparam ArrowFontStyle plain
 
 box Model MODEL_COLOR_T1
 participant ":Model" as Model MODEL_COLOR
-participant ":VersionedAddressBook" as VersionedAddressBook MODEL_COLOR
+participant ":VersionedCodeConnect" as VersionedCodeConnect MODEL_COLOR
 end box
 
-[-> Model : undoAddressBook()
+[-> Model : undoCodeConnect()
 activate Model
 
-Model -> VersionedAddressBook : undo()
-activate VersionedAddressBook
+Model -> VersionedCodeConnect : undo()
+activate VersionedCodeConnect
 
-VersionedAddressBook -> VersionedAddressBook :resetData(ReadOnlyAddressBook)
-VersionedAddressBook --> Model :
-deactivate VersionedAddressBook
+VersionedCodeConnect -> VersionedCodeConnect :resetData(ReadOnlyCodeConnect)
+VersionedCodeConnect --> Model :
+deactivate VersionedCodeConnect
 
 [<-- Model
 deactivate Model
diff --git a/docs/diagrams/tracing/LogicSequenceDiagram.puml b/docs/diagrams/tracing/LogicSequenceDiagram.puml
index 42bf46d3ce8..17074cecfed 100644
--- a/docs/diagrams/tracing/LogicSequenceDiagram.puml
+++ b/docs/diagrams/tracing/LogicSequenceDiagram.puml
@@ -3,7 +3,7 @@
 skinparam ArrowFontStyle plain
 
 Participant ":LogicManager" as logic LOGIC_COLOR
-Participant ":AddressBookParser" as abp LOGIC_COLOR
+Participant ":CodeConnectParser" as abp LOGIC_COLOR
 Participant ":EditCommandParser" as ecp LOGIC_COLOR
 Participant "command:EditCommand" as ec LOGIC_COLOR
 
@@ -14,7 +14,7 @@ create ecp
 abp -> ecp
 abp -> ecp ++: parse(arguments)
 create ec
-ecp -> ec ++: index, editPersonDescriptor
+ecp -> ec ++: index, editContactDescriptor
 ec --> ecp --
 ecp --> abp --: command
 abp --> logic --: command
diff --git a/docs/index.md b/docs/index.md
index 8acbdd73507..8e78aadeab2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,17 +3,17 @@
   title: ""
 ---
 
-# AddressBook Level-3
+# CodeConnect
 
 [![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
 [![codecov](https://codecov.io/gh/se-edu/addressbook-level3/branch/master/graph/badge.svg)](https://codecov.io/gh/se-edu/addressbook-level3)
 
 ![Ui](images/Ui.png)
 
-**AddressBook is a desktop application for managing your contact details.** While it has a GUI, most of the user interactions happen using a CLI (Command Line Interface).
+**CodeConnect is a desktop application for managing your contact details.** While it has a GUI, most of the user interactions happen using a CLI (Command Line Interface).
 
-* If you are interested in using AddressBook, head over to the [_Quick Start_ section of the **User Guide**](UserGuide.html#quick-start).
-* If you are interested about developing AddressBook, the [**Developer Guide**](DeveloperGuide.html) is a good place to start.
+* If you are interested in using CodeConnect, head over to the [_Quick Start_ section of the **User Guide**](UserGuide.html#quick-start).
+* If you are interested about developing CodeConnect, the [**Developer Guide**](DeveloperGuide.html) is a good place to start.
 
 
 **Acknowledgements**
diff --git a/docs/team/johndoe.md b/docs/team/johndoe.md
index 86aa7ebfc34..2bd25ddc384 100644
--- a/docs/team/johndoe.md
+++ b/docs/team/johndoe.md
@@ -3,9 +3,9 @@
   title: "John Doe's Project Portfolio Page"
 ---
 
-### Project: AddressBook Level 3
+### Project: CodeConnect
 
-AddressBook - Level 3 is a desktop address book application used for teaching Software Engineering principles. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+CodeConnect is a desktop address book application used for teaching Software Engineering principles. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
 
 Given below are my contributions to the project.
 
diff --git a/docs/tutorials/AddRemark.md b/docs/tutorials/AddRemark.md
index fbfc27e654f..efbba18ac02 100644
--- a/docs/tutorials/AddRemark.md
+++ b/docs/tutorials/AddRemark.md
@@ -8,7 +8,7 @@
 
 Let's walk you through the implementation of a new command — `remark`.
 
-This command allows users of the AddressBook application to add optional remarks to people in their address book and edit it if required. The command should have the following format:
+This command allows users of the CodeConnect application to add optional remarks to people in their address book and edit it if required. The command should have the following format:
 
 `remark INDEX r/REMARK` (e.g., `remark 2 r/Likes baseball`)
 
@@ -46,7 +46,7 @@ public class RemarkCommand extends Command {
 
 ### Hook `RemarkCommand` into the application
 
-Now that we have our `RemarkCommand` ready to be executed, we need to update `AddressBookParser#parseCommand()` to recognize the `remark` keyword. Add the new command to the `switch` block by creating a new `case` that returns a new instance of `RemarkCommand`.
+Now that we have our `RemarkCommand` ready to be executed, we need to update `CodeConnectParser#parseCommand()` to recognize the `remark` keyword. Add the new command to the `switch` block by creating a new `case` that returns a new instance of `RemarkCommand`.
 
 You can refer to the changes in this [diff](https://github.com/se-edu/addressbook-level3/commit/35eb7286f18a029d39cb7a29df8f172a001e4fd8#diff-399c284cb892c20b7c04a69116fcff6ccc0666c5230a1db8e4a9145def8fa4ee).
 
@@ -217,7 +217,7 @@ public RemarkCommand parse(String args) throws ParseException {
 
 <box type="info" seamless>
 
-Don’t forget to update `AddressBookParser` to use our new `RemarkCommandParser`!
+Don’t forget to update `CodeConnectParser` to use our new `RemarkCommandParser`!
 
 </box>
 
@@ -226,7 +226,7 @@ If you are stuck, check out the sample
 
 ## Add `Remark` to the model
 
-Now that we have all the information that we need, let’s lay the groundwork for propagating the remarks added into the in-memory storage of contact data. We achieve that by working with the `Person` model. Each field in a Person is implemented as a separate class (e.g. a `Name` object represents the contact’s name). That means we should add a `Remark` class so that we can use a `Remark` object to represent a remark given to a contact.
+Now that we have all the information that we need, let’s lay the groundwork for propagating the remarks added into the in-memory storage of contact data. We achieve that by working with the `Contact` model. Each field in a Contact is implemented as a separate class (e.g. a `Name` object represents the contact’s name). That means we should add a `Remark` class so that we can use a `Remark` object to represent a remark given to a contact.
 
 ### Add a new `Remark` class
 
@@ -245,7 +245,7 @@ Without getting too deep into `fxml`, let’s go on a 5 minute adventure to get
 
 Simply add the following to [`seedu.address.ui.ContactCard`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-639834f1e05afe2276a86372adf0fe5f69314642c2d93cfa543d614ce5a76688).
 
-**`PersonCard.java`:**
+**`ContactCard.java`:**
 
 ```java
 @FXML
@@ -255,9 +255,9 @@ private Label remark;
 
 `@FXML` is an annotation that marks a private or protected field and makes it accessible to FXML. It might sound like Greek to you right now, don’t worry — we will get back to it later.
 
-Then insert the following into [`main/resources/view/PersonListCard.fxml`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-d44c4f51c24f6253c277a2bb9bc440b8064d9c15ad7cb7ceda280bca032efce9).
+Then insert the following into [`main/resources/view/ContactListCard.fxml`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-d44c4f51c24f6253c277a2bb9bc440b8064d9c15ad7cb7ceda280bca032efce9).
 
-**`PersonListCard.fxml`:**
+**`ContactListCard.fxml`:**
 
 ``` xml
 <Label fx:id="remark" styleClass="cell_small_label" text="\$remark" />
@@ -267,21 +267,21 @@ That’s it! Fire up the application again and you should see something like thi
 
 ![$remark shows up in each entry](../images/add-remark/$Remark.png)
 
-## Modify `Person` to support a `Remark` field
+## Modify `Contact` to support a `Remark` field
 
-Since `PersonCard` displays data from a `Person`, we need to update `Person` to get our `Remark` displayed!
+Since `ContactCard` displays data from a `Contact`, we need to update `Contact` to get our `Remark` displayed!
 
-### Modify `Person`
+### Modify `Contact`
 
-We change the constructor of `Person` to take a `Remark`. We will also need to define new fields and accessors accordingly to store our new addition.
+We change the constructor of `Contact` to take a `Remark`. We will also need to define new fields and accessors accordingly to store our new addition.
 
-### Update other usages of `Person`
+### Update other usages of `Contact`
 
-Unfortunately, a change to `Person` will cause other commands to break, you will have to modify these commands to use the updated `Person`!
+Unfortunately, a change to `Contact` will cause other commands to break, you will have to modify these commands to use the updated `Contact`!
 
 <box type="tip" seamless>
 
-Use the `Find Usages` feature in IntelliJ IDEA on the `Person` class to find these commands.
+Use the `Find Usages` feature in IntelliJ IDEA on the `Contact` class to find these commands.
 
 </box>
 
@@ -290,13 +290,13 @@ Refer to [this commit](https://github.com/se-edu/addressbook-level3/commit/ce998
 
 ## Updating Storage
 
-AddressBook stores data by serializing `JsonAdaptedPerson` into `json` with the help of an external library — Jackson. Let’s update `JsonAdaptedPerson` to work with our new `Person`!
+CodeConnect stores data by serializing `JsonAdaptedContact` into `json` with the help of an external library — Jackson. Let’s update `JsonAdaptedContact` to work with our new `Contact`!
 
 While the changes to code may be minimal, the test data will have to be updated as well.
 
 <box type="warning" seamless>
 
-You must delete AddressBook’s storage file located at `/data/addressbook.json` before running it! Not doing so will cause AddressBook to default to an empty address book!
+You must delete CodeConnect’s storage file located at `/data/addressbook.json` before running it! Not doing so will cause AddressBook to default to an empty address book!
 
 </box>
 
@@ -305,14 +305,14 @@ to see what the changes entail.
 
 ## Finalizing the UI
 
-Now that we have finalized the `Person` class and its dependencies, we can now bind the `Remark` field to the UI.
+Now that we have finalized the `Contact` class and its dependencies, we can now bind the `Remark` field to the UI.
 
 Just add [this one line of code!](https://github.com/se-edu/addressbook-level3/commit/5b98fee11b6b3f5749b6b943c4f3bd3aa049b692)
 
-**`PersonCard.java`:**
+**`ContactCard.java`:**
 
 ```java
-public PersonCard(Person contact, int displayedIndex) {
+public ContactCard(Contact contact, int displayedIndex) {
     //...
     remark.setText(contact.getRemark().value);
 }
@@ -326,31 +326,31 @@ After the previous step, we notice a peculiar regression — we went from di
 
 ### Update `RemarkCommand` and `RemarkCommandParser`
 
-In this last step, we modify `RemarkCommand#execute()` to change the `Remark` of a `Person`. Since all fields in a `Person` are immutable, we create a new instance of a `Person` with the values that we want and
-save it with `Model#setPerson()`.
+In this last step, we modify `RemarkCommand#execute()` to change the `Remark` of a `Contact`. Since all fields in a `Contact` are immutable, we create a new instance of a `Contact` with the values that we want and
+save it with `Model#setContact()`.
 
 **`RemarkCommand.java`:**
 
 ```java
 //...
-    public static final String MESSAGE_ADD_REMARK_SUCCESS = "Added remark to Person: %1$s";
-    public static final String MESSAGE_DELETE_REMARK_SUCCESS = "Removed remark from Person: %1$s";
+    public static final String MESSAGE_ADD_REMARK_SUCCESS = "Added remark to Contact: %1$s";
+    public static final String MESSAGE_DELETE_REMARK_SUCCESS = "Removed remark from Contact: %1$s";
 //...
     @Override
     public CommandResult execute(Model model) throws CommandException {
-        List<Person> lastShownList = model.getFilteredPersonList();
+        List<Contact> lastShownList = model.getFilteredContactList();
 
         if (index.getZeroBased() >= lastShownList.size()) {
-            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+            throw new CommandException(Messages.MESSAGE_INVALID_CONTACT_DISPLAYED_INDEX);
         }
 
-        Person contactToEdit = lastShownList.get(index.getZeroBased());
-        Person editedContact = new Person(
+        Contact contactToEdit = lastShownList.get(index.getZeroBased());
+        Contact editedContact = new Contact(
                 contactToEdit.getName(), contactToEdit.getPhone(), contactToEdit.getEmail(),
                 contactToEdit.getAddress(), remark, contactToEdit.getTags());
 
-        model.setPerson(contactToEdit, editedContact);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.setContact(contactToEdit, editedContact);
+        model.updateFilteredContactList(PREDICATE_SHOW_ALL_CONTACTS);
 
         return new CommandResult(generateSuccessMessage(editedContact));
     }
@@ -360,7 +360,7 @@ save it with `Model#setPerson()`.
      * the remark is added to or removed from
      * {@code contactToEdit}.
      */
-    private String generateSuccessMessage(Person contactToEdit) {
+    private String generateSuccessMessage(Contact contactToEdit) {
         String message = !remark.value.isEmpty() ? MESSAGE_ADD_REMARK_SUCCESS : MESSAGE_DELETE_REMARK_SUCCESS;
         return String.format(message, contactToEdit);
     }
@@ -399,4 +399,4 @@ You should end up with a test that looks something like [this](https://github.co
 
 ## Conclusion
 
-This concludes the tutorial for adding a new `Command` to AddressBook.
+This concludes the tutorial for adding a new `Command` to CodeConnect.
diff --git a/docs/tutorials/RemovingFields.md b/docs/tutorials/RemovingFields.md
index 58b46e4b29a..0071e93a010 100644
--- a/docs/tutorials/RemovingFields.md
+++ b/docs/tutorials/RemovingFields.md
@@ -11,7 +11,7 @@
 > —  Antoine de Saint-Exupery
 
 When working on an existing code base, you will most likely find that some features that are no longer necessary.
-This tutorial aims to give you some practice on such a code 'removal' activity by removing the `address` field from `Person` class.
+This tutorial aims to give you some practice on such a code 'removal' activity by removing the `address` field from `Contact` class.
 
 <box type="success">
 
@@ -31,7 +31,7 @@ IntelliJ IDEA provides a refactoring tool that can identify *most* parts of a re
 
 ### Assisted refactoring
 
-The `address` field in `Person` is actually an instance of the `seedu.address.model.contact.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
+The `address` field in `Contact` is actually an instance of the `seedu.address.model.contact.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
 * :bulb: To make things simpler, you can unselect the options `Search in comments and strings` and `Search for text occurrences`
 
 ![Usages detected](../images/remove/UnsafeDelete.png)
@@ -40,11 +40,11 @@ Choose to `View Usages` and you should be presented with a list of `Safe Delete
 
 ![List of conflicts](../images/remove/SafeDeleteConflicts.png)
 
-Remove usages of `Address` by performing `Safe Delete`s on each entry i.e., double-click on the entry (which takes you to the code in concern, right-click on that entity, and choose `Refactor` -> `Safe delete` as before). You will need to exercise discretion when removing usages of `Address`. Functions like `ParserUtil#parseAddress()` can be safely removed but its usages must be removed as well. Other usages like in `EditPersonDescriptor` may require more careful inspection.
+Remove usages of `Address` by performing `Safe Delete`s on each entry i.e., double-click on the entry (which takes you to the code in concern, right-click on that entity, and choose `Refactor` -> `Safe delete` as before). You will need to exercise discretion when removing usages of `Address`. Functions like `ParserUtil#parseAddress()` can be safely removed but its usages must be removed as well. Other usages like in `EditContactDescriptor` may require more careful inspection.
 
-Let’s try removing references to `Address` in `EditPersonDescriptor`.
+Let’s try removing references to `Address` in `EditContactDescriptor`.
 
-1. Safe delete the field `address` in `EditPersonDescriptor`.
+1. Safe delete the field `address` in `EditContactDescriptor`.
 
 1. Select `Yes` when prompted to remove getters and setters.
 
@@ -55,7 +55,7 @@ Let’s try removing references to `Address` in `EditPersonDescriptor`.
 
    <box type="tip" seamless>
 
-   **Tip:** Removing usages may result in errors. Exercise discretion and fix them. For example, removing the `address` field from the `Person` class will require you to modify its constructor.
+   **Tip:** Removing usages may result in errors. Exercise discretion and fix them. For example, removing the `address` field from the `Contact` class will require you to modify its constructor.
    </box>
 
 1. Repeat the steps for the remaining usages of `Address`
@@ -66,13 +66,13 @@ After you are done, verify that the application still works by compiling and run
 
 Unfortunately, there are usages of `Address` that IntelliJ IDEA cannot identify. You can find them by searching for instances of the word `address` in your code (`Edit` \> `Find` \> `Find in path`).
 
-Places of interest to look out for would be resources used by the application. `main/resources` contains images and `fxml` files used by the application and `test/resources` contains test data. For example, there is a `$address` in each `PersonCard` that has not been removed nor identified.
+Places of interest to look out for would be resources used by the application. `main/resources` contains images and `fxml` files used by the application and `test/resources` contains test data. For example, there is a `$address` in each `ContactCard` that has not been removed nor identified.
 
 ![$address](../images/remove/$address.png)
 
-A quick look at the `PersonCard` class and its `fxml` file quickly reveals why it slipped past the automated refactoring.
+A quick look at the `ContactCard` class and its `fxml` file quickly reveals why it slipped past the automated refactoring.
 
-**`PersonCard.java`**
+**`ContactCard.java`**
 
 ```java
 ...
@@ -81,7 +81,7 @@ private Label address;
 ...
 ```
 
-**`PersonCard.fxml`**
+**`ContactCard.fxml`**
 
 ``` xml
 ...
@@ -99,12 +99,12 @@ At this point, your application is working as intended and all your tests are pa
 
 In `src/test/data/`, data meant for testing purposes are stored. While keeping the `address` field in the json files does not cause the tests to fail, it is not good practice to let cruft from old features accumulate.
 
-**`invalidPersonAddressBook.json`:**
+**`invalidContactAddressBook.json`:**
 
 ```json
 {
   "contacts": [ {
-    "name": "Person with invalid name field: Ha!ns Mu@ster",
+    "name": "Contact with invalid name field: Ha!ns Mu@ster",
     "phone": "9482424",
     "email": "hans@example.com",
     "address": "4th street"
diff --git a/docs/tutorials/TracingCode.md b/docs/tutorials/TracingCode.md
index 7ed37748b0a..22fe2e8fe30 100644
--- a/docs/tutorials/TracingCode.md
+++ b/docs/tutorials/TracingCode.md
@@ -124,14 +124,14 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
 
         CommandResult commandResult;
         //Parse user input from String to a Command
-        Command command = addressBookParser.parseCommand(commandText);
+        Command command = codeConnectParser.parseCommand(commandText);
         //Executes the Command and stores the result
         commandResult = command.execute(model);
 
         try {
             //We can deduce that the previous line of code modifies model in some way
             // since it's being stored here.
-            storage.saveAddressBook(model.getAddressBook());
+            storage.saveCodeConnect(model.getCodeConnect());
         } catch (IOException ioe) {
             throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
         }
@@ -145,7 +145,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
 1. _Step over_ the logging code since it is of no interest to us now.
    ![StepOver](../images/tracing/StepOver.png)
 
-1. _Step into_ the line where user input in parsed from a String to a Command, which should bring you to the `AddressBookParser#parseCommand()` method (partial code given below):
+1. _Step into_ the line where user input in parsed from a String to a Command, which should bring you to the `CodeConnectParser#parseCommand()` method (partial code given below):
    ```java
    public Command parseCommand(String userInput) throws ParseException {
        ...
@@ -177,7 +177,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
 
 1. Stepping through the method shows that it calls `ArgumentTokenizer#tokenize()` and `ParserUtil#parseIndex()` to obtain the arguments and index required.
 
-1. The rest of the method seems to exhaustively check for the existence of each possible parameter of the `edit` command and store any possible changes in an `EditPersonDescriptor`. Recall that we can verify the contents of `editPersonDesciptor` through the 'Variables' window.<br>
+1. The rest of the method seems to exhaustively check for the existence of each possible parameter of the `edit` command and store any possible changes in an `EditContactDescriptor`. Recall that we can verify the contents of `editContactDesciptor` through the 'Variables' window.<br>
    ![EditCommand](../images/tracing/EditCommand.png)
 
 1. As you just traced through some code involved in parsing a command, you can take a look at this class diagram to see where the various parsing-related classes you encountered fit into the design of the `Logic` component.
@@ -195,20 +195,20 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
    @Override
    public CommandResult execute(Model model) throws CommandException {
        ...
-       Person contactToEdit = lastShownList.get(index.getZeroBased());
-       Person editedContact = createEditedPerson(contactToEdit, editPersonDescriptor);
-       if (!contactToEdit.isSamePerson(editedContact) && model.hasPerson(editedContact)) {
-           throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+       Contact contactToEdit = lastShownList.get(index.getZeroBased());
+       Contact editedContact = createEditedContact(contactToEdit, editContactDescriptor);
+       if (!contactToEdit.isSameContact(editedContact) && model.hasContact(editedContact)) {
+           throw new CommandException(MESSAGE_DUPLICATE_CONTACT);
        }
-       model.setPerson(contactToEdit, editedContact);
-       model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-       return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedContact));
+       model.setContact(contactToEdit, editedContact);
+       model.updateFilteredContactList(PREDICATE_SHOW_ALL_CONTACTS);
+       return new CommandResult(String.format(MESSAGE_EDIT_CONTACT_SUCCESS, editedContact));
    }
    ```
 
 1. As suspected, `command#execute()` does indeed make changes to the `model` object. Specifically,
-   * it uses the `setPerson()` method (defined in the interface `Model` and implemented in `ModelManager` as per the usual pattern) to update the contact data.
-   * it uses the `updateFilteredPersonList` method to ask the `Model` to populate the 'filtered list' with _all_ contacts.<br>
+   * it uses the `setContact()` method (defined in the interface `Model` and implemented in `ModelManager` as per the usual pattern) to update the contact data.
+   * it uses the `updateFilteredContactList` method to ask the `Model` to populate the 'filtered list' with _all_ contacts.<br>
      FYI, The 'filtered list' is the list of contacts resulting from the most recent operation that will be shown to the user immediately after. For the `edit` command, we populate it with all the contacts so that the user can see the edited contact along with all other contacts. If this was a `find` command, we would be setting that list to contain the search results instead.<br>
      To provide some context, given below is the class diagram of the `Model` component. See if you can figure out where the 'filtered list' of contacts is being tracked.
      <puml src="../diagrams/ModelClassDiagram.puml" width="450" /><br>
@@ -226,29 +226,29 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
 
    <box type="tip" seamless>
 
-   **Intellij Tip:** When trying to step into a statement such as `storage.saveAddressBook(model.getAddressBook())` which contains multiple method calls, Intellij will let you choose (by clicking) which one you want to step into.
+   **Intellij Tip:** When trying to step into a statement such as `storage.saveCodeConnect(model.getCodeConnect())` which contains multiple method calls, Intellij will let you choose (by clicking) which one you want to step into.
    </box>
 
-1. As you step through the code inside the `Storage` component, you will eventually arrive at the `JsonAddressBook#saveAddressBook()` method which calls the `JsonSerializableAddressBook` constructor, to create an object that can be _serialized_ (i.e., stored in storage medium) in JSON format. That constructor is given below (with added line breaks for easier readability):
+1. As you step through the code inside the `Storage` component, you will eventually arrive at the `JsonCodeConnect#saveCodeConnect()` method which calls the `JsonSerializableCodeConnect` constructor, to create an object that can be _serialized_ (i.e., stored in storage medium) in JSON format. That constructor is given below (with added line breaks for easier readability):
 
-    **`JsonSerializableAddressBook` constructor:**
+    **`JsonSerializableCodeConnect` constructor:**
     ```java
     /**
-     * Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
+     * Converts a given {@code ReadOnlyCodeConnect} into this class for Jackson use.
      *
      * @param source future changes to this will not affect the created
-     * {@code JsonSerializableAddressBook}.
+     * {@code JsonSerializableCodeConnect}.
      */
-    public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
+    public JsonSerializableCodeConnect(ReadOnlyCodeConnect source) {
         contacts.addAll(
-            source.getPersonList()
+            source.getContactList()
                   .stream()
-                  .map(JsonAdaptedPerson::new)
+                  .map(JsonAdaptedContact::new)
                   .collect(Collectors.toList()));
     }
     ```
 
-1. It appears that a `JsonAdaptedPerson` is created for each `Person` and then added to the `JsonSerializableAddressBook`.
+1. It appears that a `JsonAdaptedContact` is created for each `Contact` and then added to the `JsonSerializableCodeConnect`.
    This is because regular Java objects need to go through an _adaptation_ for them to be suitable to be saved in JSON format.
 
 1. While you are stepping through the classes in the `Storage` component, here is the component's class diagram to help you understand how those classes fit into the structure of the component.<br>
@@ -306,6 +306,6 @@ Here are some quick questions you can try to answer based on your execution path
 
     4.  Add a new command
 
-    5.  Add a new field to `Person`
+    5.  Add a new field to `Contact`
 
     6.  Add a new entity to the address book
diff --git a/src/main/java/seedu/address/logic/commands/FindTechStackCommand.java b/src/main/java/seedu/address/logic/commands/FindTechStackCommand.java
new file mode 100644
index 00000000000..f6fd8429207
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/FindTechStackCommand.java
@@ -0,0 +1,59 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+import seedu.address.model.Model;
+import seedu.address.model.contact.TsContainsKeywordsPredicate;
+
+/**
+ * Finds and lists all contacts in address book whose tech stack contains any of the argument keywords.
+ * Keyword matching is case insensitive.
+ */
+public class FindTechStackCommand extends Command {
+
+    public static final String COMMAND_WORD = "find-ts";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all contacts whose tech stacks contain any of "
+            + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+            + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+            + "Example: " + COMMAND_WORD + " java python ";
+
+    private final TsContainsKeywordsPredicate predicate;
+
+    public FindTechStackCommand(TsContainsKeywordsPredicate predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.updateFilteredContactList(predicate);
+        return new CommandResult(
+                String.format(Messages.MESSAGE_CONTACT_LISTED_OVERVIEW, model.getFilteredContactList().size()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof FindCommand)) {
+            return false;
+        }
+
+        FindTechStackCommand otherFindTechStackCommand = (FindTechStackCommand) other;
+        return predicate.equals(otherFindTechStackCommand.predicate);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("predicate", predicate)
+                .toString();
+    }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/CodeConnectParser.java b/src/main/java/seedu/address/logic/parser/CodeConnectParser.java
index 104d12bc1ed..5525d5ab1be 100644
--- a/src/main/java/seedu/address/logic/parser/CodeConnectParser.java
+++ b/src/main/java/seedu/address/logic/parser/CodeConnectParser.java
@@ -16,6 +16,7 @@
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.FindCommand;
 import seedu.address.logic.commands.FindTagCommand;
+import seedu.address.logic.commands.FindTechStackCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.ListCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -72,6 +73,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case FindTagCommand.COMMAND_WORD:
             return new FindTagCommandParser().parse(arguments);
 
+        case FindTechStackCommand.COMMAND_WORD:
+            return new FindTechStackCommandParser().parse(arguments);
+
         case ListCommand.COMMAND_WORD:
             return new ListCommand();
 
diff --git a/src/main/java/seedu/address/logic/parser/FindTechStackCommandParser.java b/src/main/java/seedu/address/logic/parser/FindTechStackCommandParser.java
new file mode 100644
index 00000000000..d8cf404105f
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/FindTechStackCommandParser.java
@@ -0,0 +1,33 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import java.util.Arrays;
+
+import seedu.address.logic.commands.FindTechStackCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.contact.TsContainsKeywordsPredicate;
+
+/**
+ * Parses input arguments and creates a new FindTechStackCommand object
+ */
+public class FindTechStackCommandParser  implements Parser<FindTechStackCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the FindTechStackCommand
+     * and returns a FindTechStackCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public FindTechStackCommand parse(String args) throws ParseException {
+        String trimmedArgs = args.trim();
+        if (trimmedArgs.isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindTechStackCommand.MESSAGE_USAGE));
+        }
+
+        String[] nameKeywords = trimmedArgs.split("\\s+");
+
+        return new FindTechStackCommand(new TsContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
+    }
+
+}
diff --git a/src/main/java/seedu/address/model/contact/TagsContainKeywordsPredicate.java b/src/main/java/seedu/address/model/contact/TagsContainKeywordsPredicate.java
index 1e294339dba..9ab683bf3c5 100644
--- a/src/main/java/seedu/address/model/contact/TagsContainKeywordsPredicate.java
+++ b/src/main/java/seedu/address/model/contact/TagsContainKeywordsPredicate.java
@@ -18,7 +18,11 @@ public boolean test(Contact contact) {
         if (tagKeywords.isEmpty()) {
             return false;
         } else {
-            return tagKeywords.stream().allMatch(keyword -> contact.getTags().stream().anyMatch(tag -> StringUtil.containsWordIgnoreCase(tag.tagName, keyword)));
+            return tagKeywords.stream().allMatch(keyword ->
+                    contact.getTags().stream().anyMatch(tag ->
+                            StringUtil.containsWordIgnoreCase(tag.tagName, keyword)
+                    )
+            );
         }
     }
 
diff --git a/src/main/java/seedu/address/model/contact/TsContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/contact/TsContainsKeywordsPredicate.java
new file mode 100644
index 00000000000..b805e7c00c6
--- /dev/null
+++ b/src/main/java/seedu/address/model/contact/TsContainsKeywordsPredicate.java
@@ -0,0 +1,47 @@
+package seedu.address.model.contact;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+import seedu.address.commons.util.ToStringBuilder;
+
+/**
+ * Tests that a {@code Person}'s {@code TechStack} matches any of the keywords given.
+ */
+public class TsContainsKeywordsPredicate implements Predicate<Contact> {
+    private final List<String> techKeywords;
+
+    public TsContainsKeywordsPredicate(List<String> techKeywords) {
+        this.techKeywords = techKeywords;
+    }
+
+    @Override
+    public boolean test(Contact contact) {
+        return techKeywords.stream().allMatch(keyword ->
+            contact.getTechStack().stream().anyMatch(ts ->
+                StringUtil.containsWordIgnoreCase(ts.techStackName, keyword)
+            )
+        );
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof TagsContainKeywordsPredicate)) {
+            return false;
+        }
+
+        TsContainsKeywordsPredicate otherContainsTechStackKeywordsPredicate = (TsContainsKeywordsPredicate) other;
+        return techKeywords.equals(otherContainsTechStackKeywordsPredicate.techKeywords);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).add("techKeywords", techKeywords).toString();
+    }
+}
diff --git a/src/test/java/seedu/address/logic/commands/FindTechStackCommandTest.java b/src/test/java/seedu/address/logic/commands/FindTechStackCommandTest.java
new file mode 100644
index 00000000000..e53017eb211
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/FindTechStackCommandTest.java
@@ -0,0 +1,91 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.Messages.MESSAGE_CONTACT_LISTED_OVERVIEW;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.testutil.TypicalContacts.CARL;
+import static seedu.address.testutil.TypicalContacts.ELLE;
+import static seedu.address.testutil.TypicalContacts.FIONA;
+import static seedu.address.testutil.TypicalContacts.getTypicalCodeConnect;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.contact.TsContainsKeywordsPredicate;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindTechStackCommand}.
+ */
+public class FindTechStackCommandTest {
+    private Model model = new ModelManager(getTypicalCodeConnect(), new UserPrefs());
+    private Model expectedModel = new ModelManager(getTypicalCodeConnect(), new UserPrefs());
+
+    @Test
+    public void equals() {
+        TsContainsKeywordsPredicate firstPredicate =
+                new TsContainsKeywordsPredicate(Collections.singletonList("first"));
+        TsContainsKeywordsPredicate secondPredicate =
+                new TsContainsKeywordsPredicate(Collections.singletonList("second"));
+
+        FindTechStackCommand findFirstCommand = new FindTechStackCommand(firstPredicate);
+        FindTechStackCommand findSecondCommand = new FindTechStackCommand(secondPredicate);
+
+        // same object -> returns true
+        assertTrue(findFirstCommand.equals(findFirstCommand));
+
+        // same values -> returns true
+        FindTechStackCommand findFirstCommandCopy = new FindTechStackCommand(firstPredicate);
+        assertTrue(findFirstCommand.equals(findFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(findFirstCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(findFirstCommand.equals(null));
+
+        // different person -> returns false
+        assertFalse(findFirstCommand.equals(findSecondCommand));
+    }
+
+    @Test
+    public void execute_zeroKeywords_noContactFound() {
+        String expectedMessage = String.format(MESSAGE_CONTACT_LISTED_OVERVIEW, 0);
+        TsContainsKeywordsPredicate predicate = preparePredicate(" ");
+        FindTechStackCommand command = new FindTechStackCommand(predicate);
+        expectedModel.updateFilteredContactList(predicate);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Collections.emptyList(), model.getFilteredContactList());
+    }
+
+    @Test
+    public void execute_multipleKeywords_multipleContactsFound() {
+        String expectedMessage = String.format(MESSAGE_CONTACT_LISTED_OVERVIEW, 3);
+        TsContainsKeywordsPredicate predicate = preparePredicate("Kurz Elle Kunz");
+        FindTechStackCommand command = new FindTechStackCommand(predicate);
+        expectedModel.updateFilteredContactList(predicate);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredContactList());
+    }
+
+    @Test
+    public void toStringMethod() {
+        TsContainsKeywordsPredicate predicate = new TsContainsKeywordsPredicate(Arrays.asList("keyword"));
+        FindTechStackCommand findTechStackCommand = new FindTechStackCommand(predicate);
+        String expected = FindTechStackCommand.class.getCanonicalName() + "{predicate=" + predicate + "}";
+        assertEquals(expected, findTechStackCommand.toString());
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}.
+     */
+    private TsContainsKeywordsPredicate preparePredicate(String userInput) {
+        return new TsContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+")));
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/CodeConnectParserTest.java b/src/test/java/seedu/address/logic/parser/CodeConnectParserTest.java
index 0c0a843204c..dd22545e3d6 100644
--- a/src/test/java/seedu/address/logic/parser/CodeConnectParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/CodeConnectParserTest.java
@@ -21,11 +21,13 @@
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.FindCommand;
 import seedu.address.logic.commands.FindTagCommand;
+import seedu.address.logic.commands.FindTechStackCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.ListCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.contact.NameContainsKeywordsPredicate;
 import seedu.address.model.contact.Contact;
+import seedu.address.model.contact.TsContainsKeywordsPredicate;
 import seedu.address.testutil.EditContactDescriptorBuilder;
 import seedu.address.testutil.ContactBuilder;
 import seedu.address.testutil.ContactUtil;
@@ -85,6 +87,14 @@ public void parseCommand_findTag() throws Exception {
         assertEquals(new FindTagCommand(tagKeywords), command);
     }
 
+    @Test
+    public void parseCommand_findTechStack() throws Exception {
+        List<String> techKeywords = Arrays.asList("foo", "bar", "baz");
+        FindTechStackCommand command = (FindTechStackCommand) parser.parseCommand(
+                FindTechStackCommand.COMMAND_WORD + " " + String.join(" ", techKeywords));
+        assertEquals(new FindTechStackCommand(new TsContainsKeywordsPredicate(techKeywords)), command);
+    }
+
     @Test
     public void parseCommand_help() throws Exception {
         assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
diff --git a/src/test/java/seedu/address/logic/parser/FindTechStackCommandParserTest.java b/src/test/java/seedu/address/logic/parser/FindTechStackCommandParserTest.java
new file mode 100644
index 00000000000..a8a7f9f1703
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/FindTechStackCommandParserTest.java
@@ -0,0 +1,34 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.FindTechStackCommand;
+import seedu.address.model.contact.TsContainsKeywordsPredicate;
+
+public class FindTechStackCommandParserTest {
+
+    private FindTechStackCommandParser parser = new FindTechStackCommandParser();
+
+    @Test
+    public void parse_emptyArg_throwsParseException() {
+        assertParseFailure(parser, "     ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindTechStackCommand.MESSAGE_USAGE));
+    }
+
+    @Test
+    public void parse_validArgs_returnsFindTechStackCommand() {
+        // no leading and trailing whitespaces
+        FindTechStackCommand expectedFindCommand =
+                new FindTechStackCommand(new TsContainsKeywordsPredicate(Arrays.asList("Alice", "Bob")));
+        assertParseSuccess(parser, "Alice Bob", expectedFindCommand);
+
+        // multiple whitespaces between keywords
+        assertParseSuccess(parser, " \n Alice \n \t Bob  \t", expectedFindCommand);
+    }
+
+}
diff --git a/src/test/java/seedu/address/model/contact/TsContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/contact/TsContainsKeywordsPredicateTest.java
new file mode 100644
index 00000000000..b566ceb7dcd
--- /dev/null
+++ b/src/test/java/seedu/address/model/contact/TsContainsKeywordsPredicateTest.java
@@ -0,0 +1,84 @@
+package seedu.address.model.contact;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.ContactBuilder;
+
+public class TsContainsKeywordsPredicateTest {
+    @Test
+    public void equals() {
+        List<String> firstPredicateKeywordList = Collections.singletonList("first");
+        List<String> secondPredicateKeywordList = Arrays.asList("first", "second");
+
+        TsContainsKeywordsPredicate firstPredicate = new TsContainsKeywordsPredicate(firstPredicateKeywordList);
+        TsContainsKeywordsPredicate secondPredicate = new TsContainsKeywordsPredicate(secondPredicateKeywordList);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        TsContainsKeywordsPredicate firstPredicateCopy = new TsContainsKeywordsPredicate(firstPredicateKeywordList);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // null -> returns false
+        assertFalse(firstPredicate.equals(null));
+
+        // different person -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_techStackContainsKeywords_returnsTrue() {
+        // One keyword
+        TsContainsKeywordsPredicate predicate = new TsContainsKeywordsPredicate(Collections.singletonList("Java"));
+        assertTrue(predicate.test(new ContactBuilder().withTechStack("Java Python").build()));
+
+        // Multiple keywords
+        predicate = new TsContainsKeywordsPredicate(Arrays.asList("Java", "Python"));
+        assertTrue(predicate.test(new ContactBuilder().withTechStack("Java Python").build()));
+
+        // Only one matching keyword
+        predicate = new TsContainsKeywordsPredicate(Arrays.asList("Python", "C++"));
+        assertTrue(predicate.test(new ContactBuilder().withTechStack("Java C++").build()));
+
+        // Mixed-case keywords
+        predicate = new TsContainsKeywordsPredicate(Arrays.asList("jAvA", "pyTHON"));
+        assertTrue(predicate.test(new ContactBuilder().withTechStack("Java Python").build()));
+    }
+
+    @Test
+    public void test_techStackDoesNotContainKeywords_returnsFalse() {
+        // Zero keywords
+        TsContainsKeywordsPredicate predicate = new TsContainsKeywordsPredicate(Collections.emptyList());
+        assertFalse(predicate.test(new ContactBuilder().withTechStack("Java").build()));
+
+        // Non-matching keyword
+        predicate = new TsContainsKeywordsPredicate(Arrays.asList("C++"));
+        assertFalse(predicate.test(new ContactBuilder().withTechStack("Java Python").build()));
+
+        // Keywords match phone, email and address, but does not match name
+        predicate = new TsContainsKeywordsPredicate(Arrays.asList("12345", "alice@email.com", "Main", "Street"));
+        assertFalse(predicate.test(new ContactBuilder().withName("Alice").withPhone("12345")
+                .withEmail("alice@email.com").withAddress("Main Street").build()));
+    }
+
+    @Test
+    public void toStringMethod() {
+        List<String> keywords = List.of("keyword1", "keyword2");
+        TsContainsKeywordsPredicate predicate = new TsContainsKeywordsPredicate(keywords);
+
+        String expected = TsContainsKeywordsPredicate.class.getCanonicalName() + "{keywords=" + keywords + "}";
+        assertEquals(expected, predicate.toString());
+    }
+}