diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index ac77bc5..ccd6e1a 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Core">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PDU2_Commanding.xml b/.idea/runConfigurations/PDU2_Commanding.xml
index 9dea172..58fd207 100644
--- a/.idea/runConfigurations/PDU2_Commanding.xml
+++ b/.idea/runConfigurations/PDU2_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Core">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 7b53c10..5633f33 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -88,6 +88,7 @@ class EiveHookObject(TmTcHookBase):
 def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     from pus_tc.pdu1 import Pdu1OpCodes
     from pus_tc.pdu2 import Pdu2OpCodes
+    from pus_tc.gps import GpsOpCodes
     op_code_dict = {
         'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
         'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
@@ -99,6 +100,13 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     service_tuple = ('Core Controller', op_code_dict)
     service_op_code_dict[CustomServiceList.CORE.value] = service_tuple
 
+    op_code_dict = {
+        GpsOpCodes.RESET_GNSS.value: ('Reset GPS', {OpCodeDictKeys.TIMEOUT: 2.0})
+    }
+    service_tuple = ('GPS 0', op_code_dict)
+    service_op_code_dict[CustomServiceList.GPS_0.value] = service_tuple
+    service_op_code_dict[CustomServiceList.GPS_1.value] = service_tuple
+
     op_code_dict = {
         "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
diff --git a/config/object_ids.py b/config/object_ids.py
index ff34b95..5a67a92 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -50,6 +50,8 @@ def get_object_ids() -> Dict[bytes, list]:
          RW2_ID: "Reaction Wheel 2",
          RW3_ID: "Reaction Wheel 3",
          RW4_ID: "Reaction Wheel 4",
+         GPS_HANDLER_0_ID: "GPS 0",
+         GPS_HANDLER_1_ID: "GPS 1",
          RAD_SENSOR_ID: "Radiation Sensor",
          PLOC_SUPV_ID: "PLOC Supervisor",
          CORE_CONTROLLER_ID: "Core Controller",
diff --git a/pus_tc/gps.py b/pus_tc/gps.py
index 42b136d..5297530 100644
--- a/pus_tc/gps.py
+++ b/pus_tc/gps.py
@@ -12,7 +12,7 @@ class GpsOpCodes(enum.Enum):
     RESET_GNSS = "5"
 
 
-def pack_gps_command(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+def pack_gps_command(object_id: bytes, tc_queue: TcQueueT, op_code: str):
     if op_code == GpsOpCodes.RESET_GNSS.value:
         if object_id == GPS_HANDLER_0_ID:
             tc_queue.appendleft((QueueCommands.PRINT, "Resetting GPS device 0"))
diff --git a/tmtccmd b/tmtccmd
index e02559d..8191b67 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit e02559d2d18fa17a119144ee240423b0c7d90e2d
+Subproject commit 8191b67fd9a51f78caaa9b0b7546650679914f3e