diff --git a/src/components/board/Officers.astro b/src/components/board/Officers.astro
index f892387..ea4b547 100644
--- a/src/components/board/Officers.astro
+++ b/src/components/board/Officers.astro
@@ -4,16 +4,37 @@ import { Image } from "astro:assets";
import neko from "../../images/neko.png";
import { LiaDotCircle } from "react-icons/lia";
import Officer from "../board/Officer.astro";
+import Filter from "../board/Filter.astro";
import officers from "../../data/officers.json";
+
+// Get all unique types and add 'All' option
+const typeOrder = ["Executives", "Internal", "Events", "Projects"];
+const types = ["All", ...typeOrder];
+
+const currentFilter = "All";
---
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> chark1es-main
>>>>>> chark1es-main
/>
@@ -22,19 +43,38 @@ import officers from "../../data/officers.json";
MEET THE BOARD
+<<<<<<< HEAD
Our board comprises 31 students of varying majors, colleges, and interests! Feel free to reach out for any questions about our position or experiences.
+=======
+
+ Our board comprises 31 students of varying majors, colleges, and
+ interests! Feel free to reach out for any questions about our position
+ or experiences.
+
+
+
+
+
diff --git a/src/data/subteams.json b/src/data/subteams.json
index 5e965d9..c720958 100644
--- a/src/data/subteams.json
+++ b/src/data/subteams.json
@@ -1,20 +1,32 @@
[
- {
- "title": "Mechanical",
- "list": ["Design the Mechanisms and Structure of the Robot",
- "Fabricate and assemble robot design",
- "Integrate electronics and other hardware"]
- },
- {
- "title": "Electrical",
- "list": ["Design circuits to power and control robot subsystems",
- "Work with mechanical team to assemble electronics in the robots"]
- },
- {
- "title": "Embedded",
- "list": ["Communicate between software and hardware",
- "Provide low level software interface and API",
- "Handle and sample data using math/physics knowledge"
- ]
- }
+ {
+ "title": "Mechanical",
+ "list": [
+ "Design the Mechanisms and Structure of the Robot",
+ "Fabricate and assemble robot design",
+ "Integrate electronics and other hardware"
+ ]
+ },
+ {
+ "title": "Electrical",
+ "list": [
+ "Design circuits to power and control robot subsystems",
+ "Work with mechanical team to assemble electronics in the robots"
+ ]
+ },
+ {
+ "title": "Embedded",
+ "list": [
+ "Communicate between software and hardware",
+ "Provide low level software interface and API",
+ "Handle and sample data using math/physics knowledge"
+ ]
+ },
+ {
+ "title": "AI",
+ "list": [
+ "Design decision making algorithms using behavioral trees",
+ "Conduct testing with simulation"
+ ]
+ }
]