diff --git a/scripting/plugins/OutputGeneration/FabOutputs.py b/scripting/plugins/OutputGeneration/FabOutputs.py
index 41b8107..c7c334d 100644
--- a/scripting/plugins/OutputGeneration/FabOutputs.py
+++ b/scripting/plugins/OutputGeneration/FabOutputs.py
@@ -2,6 +2,7 @@ import pcbnew
 import os
 from datetime import datetime
 from pathlib import Path
+import zipfile
 
 __all__ = ["FabOutputs"]
 
@@ -33,7 +34,8 @@ class FabOutputs(pcbnew.ActionPlugin):
         rev = str.upper(pcb.GetTitleBlock().GetRevision())
 
         suffix = ""
-        suffix += f"_REV{rev}"
+        if rev != "":
+            suffix += f"_REV{rev}"
         suffix += f"_{now.strftime('%Y%m%d_%H%M%S')}"
 
         layer_count = pcb.GetDesignSettings().GetCopperLayerCount()
@@ -82,99 +84,103 @@ class FabOutputs(pcbnew.ActionPlugin):
             "soldermask defined": None, # TODO: how do I want to determine this?
         }
 
+        with zipfile.ZipFile(dir_fab / f"{project_name}{suffix}.zip", "w") as z:
 
-        # ================
-        # Gerbers
-        # ================
+            # ================
+            # Gerbers
+            # ================
 
-        plot_controller = pcbnew.PLOT_CONTROLLER(pcb)
-        plot_options = plot_controller.GetPlotOptions()
-        
-        # Set General Options:
-        plot_options.SetOutputDirectory(dir_fab)
-        plot_options.SetPlotFrameRef(False)
-        plot_options.SetPlotValue(False)
-        plot_options.SetPlotReference(True)
-        plot_options.SetPlotInvisibleText(False)
-        plot_options.SetPlotViaOnMaskLayer(False)
-        plot_options.SetExcludeEdgeLayer(True)
-        plot_options.SetUseAuxOrigin(False)
-        plot_options.SetMirror(False)
-        plot_options.SetNegative(False)
-        #plot_options.SetDrillMarksType(PLOT_DRILL_MARKS_TYPE)
-        #plot_options.SetScale(PLOT_SCALE)
-        plot_options.SetAutoScale(True)
-        #plot_options.SetPlotMode(PLOT_MODE)
-        #plot_options.SetLineWidth(pcbnew.FromMM(PLOT_LINE_WIDTH))
-        plot_options.SetUseGerberAttributes(True)
-        plot_options.SetUseGerberProtelExtensions(False)
-        plot_options.SetCreateGerberJobFile(False)
-        plot_options.SetSubtractMaskFromSilk(True)
-        plot_options.SetIncludeGerberNetlistInfo(False)
-        
-
-        plot_plan = [
-            # ( layer ID, file extension, description)
-            ( pcbnew.F_Paste, 'gtp', 'Front Paste' ),
-            ( pcbnew.F_SilkS, 'gto', 'Front SilkScreen' ),
-            ( pcbnew.F_Mask, 'gts', 'Front Mask' ),
-            ( pcbnew.F_Cu, 'gtl', 'Front Copper' ),
-            *[(layer, f'g{layer}', f'Inner Layer {layer} Copper') for layer in range(1, layer_count-1)],
-            ( pcbnew.B_Cu, 'gbl', 'Back Copper' ),
-            ( pcbnew.B_Mask, 'gbs', 'Back Mask' ),
-            ( pcbnew.B_SilkS, 'gbo', 'Back SilkScreen' ),
-            ( pcbnew.B_Paste, 'gbp', 'Back Paste' ),
-            ( pcbnew.Edge_Cuts, 'gm1', 'Edges Cuts' ),
-        ]
-
-
-        for layer_info in plot_plan:
-            plot_controller.SetLayer(layer_info[0])
-            plot_controller.OpenPlotfile('', pcbnew.PLOT_FORMAT_GERBER, layer_info[2])
-            plot_controller.PlotLayer()
-
-            os.rename(dir_fab / f"{project_name}.gbr", dir_fab / f"{project_name}{suffix}.{layer_info[1]}")
+            plot_controller = pcbnew.PLOT_CONTROLLER(pcb)
+            plot_options = plot_controller.GetPlotOptions()
+            
+            # Set General Options:
+            plot_options.SetOutputDirectory(dir_fab)
+            plot_options.SetPlotFrameRef(False)
+            plot_options.SetPlotValue(False)
+            plot_options.SetPlotReference(True)
+            plot_options.SetPlotInvisibleText(False)
+            plot_options.SetPlotViaOnMaskLayer(False)
+            plot_options.SetExcludeEdgeLayer(True)
+            plot_options.SetUseAuxOrigin(False)
+            plot_options.SetMirror(False)
+            plot_options.SetNegative(False)
+            #plot_options.SetDrillMarksType(PLOT_DRILL_MARKS_TYPE)
+            #plot_options.SetScale(PLOT_SCALE)
+            plot_options.SetAutoScale(True)
+            #plot_options.SetPlotMode(PLOT_MODE)
+            #plot_options.SetLineWidth(pcbnew.FromMM(PLOT_LINE_WIDTH))
+            plot_options.SetUseGerberAttributes(True)
+            plot_options.SetUseGerberProtelExtensions(False)
+            plot_options.SetCreateGerberJobFile(False)
+            plot_options.SetSubtractMaskFromSilk(True)
+            plot_options.SetIncludeGerberNetlistInfo(False)
             
-        plot_controller.ClosePlot()
 
-        # ================
-        # Drill Files
-        # ================
+            plot_plan = [
+                # ( layer ID, file extension, description)
+                ( pcbnew.F_Paste, 'gtp', 'Front Paste' ),
+                ( pcbnew.F_SilkS, 'gto', 'Front SilkScreen' ),
+                ( pcbnew.F_Mask, 'gts', 'Front Mask' ),
+                ( pcbnew.F_Cu, 'gtl', 'Front Copper' ),
+                *[(layer, f'g{layer}', f'Inner Layer {layer} Copper') for layer in range(1, layer_count-1)],
+                ( pcbnew.B_Cu, 'gbl', 'Back Copper' ),
+                ( pcbnew.B_Mask, 'gbs', 'Back Mask' ),
+                ( pcbnew.B_SilkS, 'gbo', 'Back SilkScreen' ),
+                ( pcbnew.B_Paste, 'gbp', 'Back Paste' ),
+                ( pcbnew.Edge_Cuts, 'gm1', 'Edges Cuts' ),
+            ]
 
-        METRIC = True
-        ZERO_FORMAT = pcbnew.GENDRILL_WRITER_BASE.DECIMAL_FORMAT
-        INTEGER_DIGITS = 3
-        MANTISSA_DIGITS = 3
-        MIRROR_Y_AXIS = False
-        HEADER = True
-        OFFSET = pcbnew.wxPoint(0,0)
-        MERGE_PTH_NPTH = True
-        DRILL_FILE = True
-        MAP_FILE = False
-        REPORTER = None
 
-        drill_writer = pcbnew.EXCELLON_WRITER(pcb)
-        drill_writer.SetFormat(METRIC, ZERO_FORMAT, INTEGER_DIGITS, MANTISSA_DIGITS)
-        drill_writer.SetOptions(MIRROR_Y_AXIS, HEADER, OFFSET, MERGE_PTH_NPTH)
-        drill_writer.CreateDrillandMapFilesSet(str(dir_fab), DRILL_FILE, MAP_FILE, REPORTER)
+            for layer_info in plot_plan:
+                plot_controller.SetLayer(layer_info[0])
+                plot_controller.OpenPlotfile('', pcbnew.PLOT_FORMAT_GERBER, layer_info[2])
+                plot_controller.PlotLayer()
 
-        os.rename(dir_fab / f"{project_name}.drl", dir_fab / f"{project_name}{suffix}.drl")
+                os.rename(dir_fab / f"{project_name}.gbr", dir_fab / f"{project_name}{suffix}.{layer_info[1]}")
+                z.write(dir_fab / f"{project_name}{suffix}.{layer_info[1]}", arcname=f"{project_name}{suffix}.{layer_info[1]}")
+                
+            plot_controller.ClosePlot()
 
+            # ================
+            # Drill Files
+            # ================
+
+            METRIC = True
+            ZERO_FORMAT = pcbnew.GENDRILL_WRITER_BASE.DECIMAL_FORMAT
+            INTEGER_DIGITS = 3
+            MANTISSA_DIGITS = 3
+            MIRROR_Y_AXIS = False
+            HEADER = True
+            OFFSET = pcbnew.wxPoint(0,0)
+            MERGE_PTH_NPTH = True
+            DRILL_FILE = True
+            MAP_FILE = False
+            REPORTER = None
+
+            drill_writer = pcbnew.EXCELLON_WRITER(pcb)
+            drill_writer.SetFormat(METRIC, ZERO_FORMAT, INTEGER_DIGITS, MANTISSA_DIGITS)
+            drill_writer.SetOptions(MIRROR_Y_AXIS, HEADER, OFFSET, MERGE_PTH_NPTH)
+            drill_writer.CreateDrillandMapFilesSet(str(dir_fab), DRILL_FILE, MAP_FILE, REPORTER)
+
+            os.rename(dir_fab / f"{project_name}.drl", dir_fab / f"{project_name}{suffix}.drl")
+            z.write(dir_fab / f"{project_name}{suffix}.drl", arcname=f"{project_name}{suffix}.drl")
+
+            # ================
+            # Fab Drawing
+            # ================
+
+            with open(dir_fab / f"README_FABRICATION{suffix}.TXT", "w") as f:
+                f.write(f"{project_name}-REV{rev}\n")
+                f.write(f"Layer Order\n")
+                # for layer in plot_plan:
+            
+            z.write(dir_fab / f"README_FABRICATION{suffix}.TXT", arcname=f"README_FABRICATION{suffix}.TXT")
+            
         # ================
         # Pick and Place
-        # ================
+        # ================s
 
         # TODO
-
-        # ================
-        # Fab Drawing
-        # ================
-
-        with open(dir_fab / f"README_FABRICATION{suffix}.TXT", "w") as f:
-            f.write(f"{project_name}-REV{rev}\n")
-            f.write(f"Layer Order\n")
-            # for layer in plot_plan:
-                
         
         # ================
         # Assembly Drawing