diff --git a/CMakeLists.txt b/CMakeLists.txt
index 761b12a..01195ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,11 +32,15 @@ set(msg_files
   "msg/Line2D.msg"
   "msg/Line2DArray.msg"
   "msg/SonarInfo.msg"
+  "msg/OperationMode.msg"
 )
 
 set(srv_files
   "srv/MissionParameters.srv"
   "srv/SendWaypoints.srv"
+  "srv/OperationModeSRV.srv"
+  "srv/SetKillswitch.srv"
+  "srv/ToggleKillswitch.srv"
 )
 
 set(action_files
@@ -80,3 +84,6 @@ ament_package()
 # Omg hello 😊
 # Can we be friends, jk lul hihi 🤭
 # Unless... 😳👉👈
+
+# Okie :3
+# Friendship accepted!1!!
\ No newline at end of file
diff --git a/msg/OperationMode.msg b/msg/OperationMode.msg
new file mode 100644
index 0000000..3bb3b0c
--- /dev/null
+++ b/msg/OperationMode.msg
@@ -0,0 +1,8 @@
+# Enum operation mode
+uint8 mode
+
+# Operation mode
+uint8 AUTONOMOUS = 1
+uint8 MANUAL = 2
+uint8 REFERENCE = 3
+
diff --git a/srv/OperationModeSRV.srv b/srv/OperationModeSRV.srv
new file mode 100644
index 0000000..75e701d
--- /dev/null
+++ b/srv/OperationModeSRV.srv
@@ -0,0 +1,10 @@
+#request
+uint8 mode
+
+vortex_msgs/OperationMode[] modes
+
+---
+#response
+uint8 mode
+bool killswitch_status 
+
diff --git a/srv/SetKillswitch.srv b/srv/SetKillswitch.srv
new file mode 100644
index 0000000..9c86945
--- /dev/null
+++ b/srv/SetKillswitch.srv
@@ -0,0 +1,7 @@
+#request
+bool killswitch_on
+
+---
+#response
+uint8 mode
+bool killswitch_status
\ No newline at end of file
diff --git a/srv/ToggleKillswitch.srv b/srv/ToggleKillswitch.srv
new file mode 100644
index 0000000..f7bd776
--- /dev/null
+++ b/srv/ToggleKillswitch.srv
@@ -0,0 +1,5 @@
+#request
+---
+#response
+uint8 mode
+bool killswitch_status
\ No newline at end of file