Index: dialin/dg/drain_pump.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class DGDrainPump(_AbstractSubSystem):
@@ -38,7 +39,7 @@
     START_POS_DAC = END_POS_SET_SPD
     END_POS_DAC = START_POS_DAC + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         DGDrainPump constructor
 
Index: dialin/dg/hd_proxy.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -18,6 +18,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class DGHDProxy(_AbstractSubSystem):
@@ -37,7 +38,7 @@
     RESERVOIR1 = 0
     RESERVOIR2 = 1
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: Denali CAN Messenger object
Index: dialin/dg/heaters.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/heaters.py	(.../heaters.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/heaters.py	(.../heaters.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -21,7 +21,9 @@
 from .constants import NO_RESET
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
+
 class Heaters(_AbstractSubSystem):
 
     MSG_ID_DG_HEATERS_DATA = 0x2C
@@ -37,7 +39,7 @@
     START_POS_TRIMMER_HEATER = END_POS_SMALL_PRI_HEATER
     END_POS_TRIMMER_HEATER = START_POS_TRIMMER_HEATER + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
 
         super().__init__()
         self.can_interface = can_interface
Index: dialin/dg/load_cells.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class DGLoadCells(_AbstractSubSystem):
@@ -50,7 +51,7 @@
     LOAD_CELL_B1 = 2
     LOAD_CELL_B2 = 3
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: Denali Can Messenger object
Index: dialin/dg/pressures.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/pressures.py	(.../pressures.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/pressures.py	(.../pressures.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,7 +20,9 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
+
 class DGPressures(_AbstractSubSystem):
     """
     DG interface containing pressure related commands.
@@ -47,7 +49,7 @@
     PRESSURE_SENSOR_DRAIN_PUMP_INLET = 2
     PRESSURE_SENSOR_DRAIN_PUMP_OUTLET = 3
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: The DenaliCANMessenger object
Index: dialin/dg/reservoirs.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/reservoirs.py	(.../reservoirs.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/reservoirs.py	(.../reservoirs.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -18,6 +18,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class DGReservoirs(_AbstractSubSystem):
@@ -40,7 +41,7 @@
     RESERVOIR1 = 0
     RESERVOIR2 = 1
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: The DenaliCANMessenger object
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class DGROPump(_AbstractSubSystem):
@@ -43,7 +44,7 @@
     START_POS_PWM = END_POS_MEAS_FLOW
     END_POS_PWM = START_POS_PWM + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         DGROPump constructor
         """
Index: dialin/dg/temperature_sensors.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,7 +20,9 @@
 from .constants import NO_RESET
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
+
 class TemperatureSensors(_AbstractSubSystem):
 
     MSG_ID_DG_TEMPERATURE_DATA = 0x2D
@@ -64,7 +66,7 @@
     START_POS_TRI_INTERNAL_TEMP = END_POS_PRI_INTERNAL_TEMP
     END_POS_TRI_INTERNAL_TEMP = START_POS_TRI_INTERNAL_TEMP + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
 
         super().__init__()
 
Index: dialin/dg/valves.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/dg/valves.py	(.../valves.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/dg/valves.py	(.../valves.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from .constants import NO_RESET
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 # Valve states
 ENERGIZED = True
@@ -55,7 +56,7 @@
     VALVE_RESERVOIR_2 = 11       # VR2
     VALVE_PRODUCTION_DRAIN = 12  # VPD
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: Denali CAN Messenger object
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
 import struct
+from logging import Logger
 
 
 class HDBloodFlow(_AbstractSubSystem):
@@ -56,7 +57,7 @@
     START_POS_PWM_DC = END_POS_MEAS_MC_CURR
     END_POS_PWM_DC = START_POS_PWM_DC + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HD_BloodFlow constructor
 
Index: dialin/hd/buttons.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/buttons.py	(.../buttons.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/buttons.py	(.../buttons.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -18,6 +18,7 @@
 from ..utils.conversions import integer_to_bytearray
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDButtons(_AbstractSubSystem):
@@ -29,7 +30,7 @@
     MSG_ID_HD_OFF_BUTTON_OVERRIDE = 0x8002
     MSG_ID_HD_STOP_BUTTON_OVERRIDE = 0x8003
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HD_Buttons constructor
 
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 class HDDialysateInletFlow(_AbstractSubSystem):
     """
@@ -55,7 +56,7 @@
     START_POS_PWM_DC = END_POS_MEAS_MC_CURR
     END_POS_PWM_DC = START_POS_PWM_DC + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HD_DialysateFlow constructor
 
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDDialysateOutletFlow(_AbstractSubSystem):
@@ -55,7 +56,7 @@
     START_POS_PWM_DC = END_POS_MEAS_MC_CURR
     END_POS_PWM_DC = START_POS_PWM_DC + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HDDialysateFlow constructor
         """
Index: dialin/hd/pressure_occlusion.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDPressureOcclusion(_AbstractSubSystem):
@@ -48,7 +49,7 @@
     START_POS_DOP_OCCL = END_POS_DIP_OCCL
     END_POS_DOP_OCCL = START_POS_DOP_OCCL + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HDPressureOcclusion constructor
 
Index: dialin/hd/rtc.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/rtc.py	(.../rtc.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/rtc.py	(.../rtc.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -19,6 +19,7 @@
                              DenaliChannels)
 from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDRTC(_AbstractSubSystem):
@@ -34,7 +35,7 @@
     START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_SET_PT = START_POS_SET_PT + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: Denali Can Messenger object
Index: dialin/hd/treatment.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/treatment.py	(.../treatment.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -18,6 +18,7 @@
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDTreatment(_AbstractSubSystem):
@@ -47,7 +48,7 @@
     START_POS_SALINE_BOLUS_IN_PROGRESS = END_POS_UF_STATE
     END_POS_SALINE_BOLUS_IN_PROGRESS = START_POS_SALINE_BOLUS_IN_PROGRESS + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
         HDTreatment constructor
         """
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -20,6 +20,7 @@
 import struct
 from ..utils.base import _AbstractSubSystem, _publish
 from collections import OrderedDict
+from logging import Logger
 
 
 class HDUIProxy(_AbstractSubSystem):
@@ -142,7 +143,7 @@
     START_POS_BLD_DIAL_CHG_RSP_DIAL_RATE = END_POS_BLD_DIAL_CHG_RSP_BLD_RATE
     END_POS_BLD_DIAL_CHG_RSP_DIAL_RATE = START_POS_BLD_DIAL_CHG_RSP_DIAL_RATE + 4
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: the denali can interface object
Index: dialin/hd/watchdog.py
===================================================================
diff -u -radd8b1e7cce0187c9fb5b09a5881d0121f9a0ddb -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- dialin/hd/watchdog.py	(.../watchdog.py)	(revision add8b1e7cce0187c9fb5b09a5881d0121f9a0ddb)
+++ dialin/hd/watchdog.py	(.../watchdog.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -19,6 +19,7 @@
 from ..utils.conversions import integer_to_bytearray
 from .constants import RESET, NO_RESET
 from ..utils.base import _AbstractSubSystem, _publish
+from logging import Logger
 
 
 class HDWatchdog(_AbstractSubSystem):
@@ -29,7 +30,7 @@
     # watchdog message IDs
     MSG_ID_HD_WD_CHECKIN_OVERRIDE = 0x8005
 
-    def __init__(self, can_interface, logger):
+    def __init__(self, can_interface, logger: Logger):
         """
 
         @param can_interface: the denali can interface object
Index: tests/test_dg_valves.py
===================================================================
diff -u -rfb9052e39fb778d3d029eda4d6917a0a1fcb9cbd -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- tests/test_dg_valves.py	(.../test_dg_valves.py)	(revision fb9052e39fb778d3d029eda4d6917a0a1fcb9cbd)
+++ tests/test_dg_valves.py	(.../test_dg_valves.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -29,30 +29,12 @@
     if dg.cmd_log_in_to_dg() == 0:
         print("DG login failed.")
         exit(1)
-    sleep(1)
 
-    # Create log file
-    with open("DG_valves_test.log", "w") as f:
-        # Collect DG valves states
-        while True:
-            sleep(1)
-            valvesStates = "DGValves.VBF," + str(dg.valves.valve_state_VRF.get("state", None)) + \
-                           ",DGValves.VRI," + str(dg.valves.valve_state_VRI.get("state", None)) + \
-                           ",DGValves.VRD," + str(dg.valves.valve_state_VRD.get("state", None)) + \
-                           ",DGValves.VRO," + str(dg.valves.valve_state_VRO.get("state", None)) + \
-                           ",DGValves.VPO," + str(dg.valves.valve_state_VPO.get("state", None)) + \
-                           ",DGValves.VBF," + str(dg.valves.valve_state_VBF.get("state", None)) + \
-                           ",DGValves.VRC," + str(dg.valves.valve_state_VRC.get("state", None)) + \
-                           ",DGValves.VDR," + str(dg.valves.valve_state_VDR.get("state", None)) + \
-                           ",DGValves.VPI," + str(dg.valves.valve_state_VPI.get("state", None)) + \
-                           ",DGValves.VSP," + str(dg.valves.valve_state_VSP.get("state", None)) + \
-                           ",DGValves.VR1," + str(dg.valves.valve_state_VR1.get("state", None)) + \
-                           ",DGValves.VR2," + str(dg.valves.valve_state_VR2.get("state", None)) + \
-                           ",DGValves.VPD," + str(dg.valves.valve_state_VPD.get("state", None))
-
-            # Log data
-            f.write(valvesStates)
-            f.write("\n")
-
-            # Print to console
-            print("DG Valves States: "+valvesStates)
+    dg.valves.cmd_valve_override(True, 3, 0)
+    for i in range(len(dg.valves.get_valve_states())):
+        dg.valves.cmd_valve_override(False, i, 1)
+    while True:
+        sleep(1)
+        # dg.valves.cmd_valve_override(True, 3, 1)
+        dg.valves.cmd_valve_override(True, 3, 0)
+        print(dg.valves.get_valve_states())
Index: tests/test_logging.py
===================================================================
diff -u -r230ea55fde6d0221299f7e03116c800396de7d66 -rb62b040b80e3b42e9749ee8689f5d65c5dcc71e0
--- tests/test_logging.py	(.../test_logging.py)	(revision 230ea55fde6d0221299f7e03116c800396de7d66)
+++ tests/test_logging.py	(.../test_logging.py)	(revision b62b040b80e3b42e9749ee8689f5d65c5dcc71e0)
@@ -34,7 +34,8 @@
             time.sleep(0.5)
             print(dg.dg_version)
     if True:
-        hd = HD()
+        # hd = HD(log_level="CAN_ONLY")
+        hd = HD(log_level="DEBUG")
         if hd.cmd_log_in_to_hd():
             hd.ui.cmd_ui_request_hd_version()