Index: dialin/hd/treatment.py
===================================================================
diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r63bd417b789318ee3c1221d164084a2853c14278
--- dialin/hd/treatment.py	(.../treatment.py)	(revision ebf0a72a1a1a52f3cfe20975de4857201275888c)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision 63bd417b789318ee3c1221d164084a2853c14278)
@@ -136,102 +136,142 @@
         self.recirc_timeout_secs = 0
         self.recirc_countdown_secs = 0
 
-    def get_treatment_time_prescribed(self):
+    def get_treatment_time_prescribed(self) -> int:
         """
         Gets the prescribed treatment time
 
         @return: The prescribed treatment time
         """
         return self.treatment_time_prescribed
 
-    def get_treatment_time_elapsed(self):
+    def get_treatment_time_elapsed(self) -> int:
         """
         Gets the elapsed treatment time
 
         @return: The elapsed treatment time
         """
         return self.treatment_time_elapsed
 
-    def get_treatment_time_remaining(self):
+    def get_treatment_time_remaining(self) -> int:
         """
         Gets the remaining treatment time
 
         @return: The remaining treatment time
         """
         return self.treatment_time_remaining
 
-    def get_treatment_state(self):
+    def get_treatment_state(self) -> int:
         """
         Gets the treatment state
 
         @return: The treatment state
         """
         return self.treatment_state
 
-    def get_treatment_uf_state(self):
+    def get_treatment_uf_state(self) -> int:
         """
         Gets the treatment uf state
 
         @return: The treatment uf state
         """
         return self.treatment_uf_state
 
-    def get_saline_bolus_state(self):
+    def get_saline_bolus_state(self) -> int:
         """
         Gets the current saline bolus state
 
         @return: The saline bolus state
         """
         return self.saline_bolus_state
 
-    def get_heparin_state(self):
+    def get_heparin_state(self) -> int:
         """
         Gets the current Heparin state
 
         @return: The Heparin state
         """
         return self.heparin_state
 
-    def get_rinseback_state(self):
+    def get_rinseback_state(self) -> int:
         """
         Gets the current rinseback state
 
         @return: The rinseback state
         """
         return self.rinseback_state
 
-    def get_treatment_recirc_state(self):
+    def get_treatment_recirc_state(self) -> int:
         """
         Gets the current treatment recirculate state
 
         @return: The treatment recirculate state
         """
         return self.treatment_recirculate_state
 
-    def get_saline_bolus_max_volume(self):
+    def get_saline_bolus_max_volume(self) -> int:
         """
         Returns maximum volume (in mL) saline that can be delivered to a patient
 
         @return: The maximum saline bolus volume
         """
         return self.saline_bolus_max_vol
 
-    def get_saline_bolus_cumulative_volume_delivered(self):
+    def get_saline_bolus_cumulative_volume_delivered(self) -> float:
         """
         Returns cumulative volume (in mL) of saline delivered
 
         @return: The cumulative saline volume delivered
         """
         return self.saline_bolus_cum_vol
 
-    def get_saline_bolus_volume_delivered(self):
+    def get_saline_bolus_volume_delivered(self) -> float:
         """
         Returns bolus volume (in mL) of saline delivered
 
         @return: The bolus saline volume delivered
         """
         return self.saline_bolus_bol_vol
 
+    def get_rinseback_target_volume(self) -> float:
+        """
+        Returns rinseback target volume (in mL)
+
+        @return: The rinseback target volume
+        """
+        return self.rinseback_tgt_vol
+
+    def get_rinseback_current_volume(self) -> float:
+        """
+        Returns rinseback current volume (in mL)
+
+        @return: The rinseback current volume
+        """
+        return self.rinseback_cum_vol
+
+    def get_rinseback_current_rate(self) -> int:
+        """
+        Returns rinseback current rate (in mL/min)
+
+        @return: The rinseback current rate
+        """
+        return self.rinseback_cur_rate
+
+    def get_rinseback_timeout(self) -> int:
+        """
+        Returns rinseback timeout (in seconds)
+
+        @return: The rinseback timeout
+        """
+        return self.rinseback_timeout_secs
+
+    def get_rinseback_timeout_countdown(self) -> int:
+        """
+        Returns rinseback timeout countdown (in seconds)
+
+        @return: The rinseback timeout countdown
+        """
+        return self.rinseback_countdown_secs
+
     @publish([
         "treatment_time_prescribed",
         "treatment_time_elapsed",