diff --git a/src/lib/helpers/__init__.py b/src/lib/helpers/__init__.py
index ad38086..24a7fb5 100644
--- a/src/lib/helpers/__init__.py
+++ b/src/lib/helpers/__init__.py
@@ -6,6 +6,7 @@ from .performancer import clock_this, log_this, time_this
 from .qthread_catcher import ReloadingBase, ReloadingWrapper
 from .qthread_synchronizer import SynchronizingBase, SynchronizingWrapper
 from .resources import get_path, get_resource
+from .shift import get_current_shift, get_shift
 from .timing import timing
 
 
diff --git a/src/lib/helpers/shift.py b/src/lib/helpers/shift.py
new file mode 100644
index 0000000..f13f7cc
--- /dev/null
+++ b/src/lib/helpers/shift.py
@@ -0,0 +1,17 @@
+from datetime import datetime
+
+
+def get_current_shift():
+    return get_shift(datetime.now())
+
+
+def get_shift(date_time):
+    if date_time.hour >= 6 and date_time.hour < 14:
+        shift = 1
+    elif date_time.hour >= 14 and date_time.hour < 22:
+        shift = 2
+    elif date_time.hour >= 22 or date_time.hour < 6:
+        shift = 3
+    else:
+        shift = None
+    return shift
diff --git a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py
index 6c45e7e..722cc2d 100644
--- a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py
+++ b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py
@@ -1,5 +1,4 @@
-from lib.db import Recipes, Steps
-from playhouse.shortcuts import model_to_dict
+from lib.db import Steps
 from ui.editor import Editor
 from ui.helpers import replace_widget
 from ui.leak_step_editor import Leak_Step_Editor
diff --git a/src/ui/test/test.py b/src/ui/test/test.py
index a198a23..26f1b09 100755
--- a/src/ui/test/test.py
+++ b/src/ui/test/test.py
@@ -4,6 +4,8 @@ import sys
 from datetime import datetime
 
 from lib.db import Archive, Steps, Users
+from lib.helpers import get_shift
+from playhouse.shortcuts import model_to_dict
 from PyQt5.QtCore import QTimer
 from ui.helpers import replace_widget
 from ui.recipe_selection import Recipe_Selection
@@ -16,9 +18,9 @@ from ui.widget import Widget
 
 
 class Test(Widget):
-    def __init__(self, system_name=None, components=None):
+    def __init__(self, machine_id=None, components=None):
         super().__init__()
-        self.system_name = system_name
+        self.machine_id = machine_id
         self.components = components
         # GET LOGGER
         self.log = logging.getLogger("Test")
@@ -106,9 +108,9 @@ class Test(Widget):
         img_path = "./src/ui/imgs"
         names = []
         if suffix is not None:
-            names.append(f"{step}_{suffix}_{self.system_name}")
+            names.append(f"{step}_{suffix}_{self.machine_id}")
             names.append(f"{step}_{suffix}")
-        names.append(f"{step}_{self.system_name}")
+        names.append(f"{step}_{self.machine_id}")
         names.append(f"{step}")
         for name in names:
             for ext in ["png", "jpg"]:
@@ -251,6 +253,7 @@ class Test(Widget):
     def set_leak(self, leak=None):
         if "leak" not in self.data:
             self.data["leak"] = []
+        leak["step"] = model_to_dict(self.step)
         self.data["leak"].append(leak)
         self.data["overridden"] = self.data["overridden"] or leak.get("overridden", False)
         self.data["ok"] = self.data["ok"] and leak.get("ok", False)
@@ -259,6 +262,7 @@ class Test(Widget):
     def set_vision(self, vision=None):
         if "vision" not in self.data:
             self.data["vision"] = []
+        vision["step"] = model_to_dict(self.step)
         self.data["vision"].append(vision)
         self.data["overridden"] = self.data["overridden"] or vision.get("overridden", False)
         self.data["ok"] = self.data["ok"] and vision.get("ok", False)
@@ -280,8 +284,8 @@ class Test(Widget):
             "DATAMATRIX_TEXT": str(self.data.get("barcodes", {}).get("serial", "-")),
             "PIECE_NUM": str(self.data.get("barcodes", {}).get("serial", "-")),
             "DATETIME": str(archived.time.isoformat()),
-            "SHIFT": "-",
-            "STATION": "-",
+            "SHIFT": str(get_shift(archived.time)),
+            "STATION": self.machine_id,
             "OPERATOR": str(Users.get_session().user.username),
             "PMAX": "-",
             "PMIN": "-",