diff --git a/EosLib/format/__init__.py b/EosLib/format/__init__.py
index d74bf64..069f90e 100644
--- a/EosLib/format/__init__.py
+++ b/EosLib/format/__init__.py
@@ -1,4 +1,4 @@
 from EosLib.format.formats import telemetry_data, position, empty_format, cutdown, ping_format, valve, e_field, \
                                   science_data, field_mill
-from EosLib.format.formats.health import driver_health_report, health_response
+from EosLib.format.formats.health import driver_health_report, health_query, health_response
 from EosLib.format.definitions import Type as Type
diff --git a/EosLib/format/definitions.py b/EosLib/format/definitions.py
index 394348a..f9bc0fa 100644
--- a/EosLib/format/definitions.py
+++ b/EosLib/format/definitions.py
@@ -19,5 +19,6 @@ class Type(IntEnum):
     SCIENCE_DATA = 13
     DRIVER_HEALTH_REPORT = 14
     FIELDMILL = 15
+    HEALTH_QUERY = 16
     HEALTH_RESPONSE = 17
     ERROR = 255
diff --git a/EosLib/format/formats/health/health_query.py b/EosLib/format/formats/health/health_query.py
new file mode 100644
index 0000000..a2d2104
--- /dev/null
+++ b/EosLib/format/formats/health/health_query.py
@@ -0,0 +1,67 @@
+from abc import abstractmethod
+from dataclasses import dataclass
+from enum import IntEnum, unique
+from typing_extensions import Self
+import struct
+
+from EosLib.device import Device
+from EosLib.format.base_format import BaseFormat
+from EosLib.format.definitions import Type
+
+@unique
+class QueryType(IntEnum):
+    DEVICE = 0
+    DEVICE_HISTORY = 1
+    LOGS = 2
+@dataclass
+class HealthQuery(BaseFormat):
+
+    def __init__(self, device_id: Device, query_type: QueryType):
+        self.device_id = device_id
+        self.query_type = query_type
+        self.valid = self.get_validity()
+
+    @staticmethod
+    def get_format_string(self) -> str:
+        return "!" \
+               "B" \
+               "B"
+
+    @staticmethod
+    def _i_promise_all_abstract_methods_are_implemented() -> bool:
+        """ This method exists because if you use a dataclass-based format ABC gets mad because it can't figure out
+           that the dataclass implements __init__, __eq__, etc.
+
+
+           :return: True if isabstract check should be bypassed, otherwise False
+       """
+        return True
+
+    @staticmethod
+    @abstractmethod
+    def get_format_type() -> Type:
+        return Type.HEALTH_QUERY
+        # raise NotImplementedError
+
+    @abstractmethod
+    def encode(self) -> bytes:
+        return struct.pack(self.get_format_string(),
+                           self.device_id,
+                           self.query_type
+                           )
+        # raise NotImplementedError
+
+    @classmethod
+    @abstractmethod
+    def decode(cls, data: bytes) -> Self:
+        unpacked_data = struct.unpack(cls.get_format_string(), data)
+        return HealthQuery(unpacked_data[0], unpacked_data[1])
+        # raise NotImplementedError
+
+    @abstractmethod
+    def get_validity(self) -> bool:
+        return (
+                0 <= self.device_id <= len(Device)
+                and 0 <= self.query_type <= len(QueryType)
+        )
+        # raise NotImplementedError