diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index 3ef7f0ae73..d65bda2dc1 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -36,10 +36,14 @@ protected override void Open()
                 new ItemSlotButtonPressedEvent(SharedChemMaster.InputSlotName));
             _window.OutputEjectButton.OnPressed += _ => SendMessage(
                 new ItemSlotButtonPressedEvent(SharedChemMaster.OutputSlotName));
-            _window.BufferTransferButton.OnPressed += _ => SendMessage(
-                new ChemMasterSetModeMessage(ChemMasterMode.Transfer));
+            _window.BufferStorageButton.OnPressed += _ => SendMessage(
+                new ChemMasterSetModeMessage(ChemMasterMode.Storage));
+            _window.BufferOutputButton.OnPressed += _ => SendMessage(
+                new ChemMasterSetModeMessage(ChemMasterMode.Output));
             _window.BufferDiscardButton.OnPressed += _ => SendMessage(
                 new ChemMasterSetModeMessage(ChemMasterMode.Discard));
+            _window.OutputBufferDiscardButton.OnPressed += _ => SendMessage(
+                new ChemMasterDiscardBufferMessage(SharedChemMaster.OutputBufferSolutionName));
             _window.CreatePillButton.OnPressed += _ => SendMessage(
                 new ChemMasterCreatePillsMessage(
                     (uint) _window.PillDosage.Value, (uint) _window.PillNumber.Value, _window.LabelLine));
@@ -53,7 +57,7 @@ protected override void Open()
                 _window.PillTypeButtons[i].OnPressed += _ => SendMessage(new ChemMasterSetPillTypeMessage(pillType));
             }
 
-            _window.OnReagentButtonPressed += (args, button) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, button.Amount, button.IsBuffer));
+            _window.OnReagentButtonPressed += (args, button) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, button.Amount, button.IsBuffer, button.Origin));
         }
 
         /// <summary>
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index b1f4f5917f..4d08a2e17c 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -33,7 +33,8 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-buffer-text'}" />
                 <Control HorizontalExpand="True" />
-                <Button MinSize="80 0" Name="BufferTransferButton" Access="Public" Text="{Loc 'chem-master-window-transfer-button'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="BufferStorageButton" Access="Public" Text="{Loc 'chem-master-window-storage-button'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="BufferOutputButton" Access="Public" Text="{Loc 'chem-master-window-output-button'}" ToggleMode="True" StyleClasses="ButtonSquare" />
                 <Button MinSize="80 0" Name="BufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="True" StyleClasses="OpenLeft" />
             </BoxContainer>
 
@@ -45,7 +46,7 @@
 
                 <ScrollContainer HorizontalExpand="True" MinSize="0 200">
                     <!-- Buffer reagent list -->
-                    <BoxContainer Name="BufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
+                    <BoxContainer Name="StorageBufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
                     </BoxContainer>
                 </ScrollContainer>
@@ -60,12 +61,12 @@
                 <Button MinSize="80 0" Name="OutputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 100">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 100">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="OutputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
@@ -73,6 +74,29 @@
                 </ScrollContainer>
             </PanelContainer>
 
+             <!-- Padding -->
+            <Control MinSize="0 10" />
+
+            <!-- Output Buffer Reagent List -->
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'chem-master-window-output-buffer-text'}" />
+                <Control HorizontalExpand="True" />
+                <Button MinSize="80 0" Name="OutputBufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="False" StyleClasses="OpenRight" />
+            </BoxContainer>
+
+            <PanelContainer VerticalExpand="True" MinSize="0 100">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                </PanelContainer.PanelOverride>
+
+                <ScrollContainer HorizontalExpand="True" MinSize="0 100">
+                    <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
+                    <BoxContainer Name="OutputBufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
+                        <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
+                    </BoxContainer>
+                </ScrollContainer>
+            </PanelContainer>
+
             <!-- Padding -->
             <Control MinSize="0 10" />
 
@@ -80,8 +104,8 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-packaging-text'}" />
                 <Control HorizontalExpand="True"/>
-                <Label Text="{Loc 'chem-master-window-buffer-label'}" />
-                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
+                <!-- <Label Text="{Loc 'chem-master-window-buffer-label'}" />
+                <Label Name="BufferOutputVolume" StyleClasses="LabelSecondaryColor" /> -->
             </BoxContainer>
 
             <!-- Wrap the packaging info-->
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 5eace08a7f..9b6b60059a 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -88,9 +88,9 @@ public ChemMasterWindow()
             Tabs.SetTabTitle(1, Loc.GetString("chem-master-window-output-tab"));
         }
 
-        private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string styleClass)
+        private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string origin, string styleClass)
         {
-            var button = new ReagentButton(text, amount, id, isBuffer, styleClass);
+            var button = new ReagentButton(text, amount, id, isBuffer, origin, styleClass);
             button.OnPressed += args
                 => OnReagentButtonPressed?.Invoke(args, button);
             return button;
@@ -109,7 +109,7 @@ public void UpdateState(BoundUserInterfaceState state)
 
             var output = castState.OutputContainerInfo;
 
-            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+            //BufferOutputVolume.Text = $" {castState.BufferOutputVolume?.Int() ?? 0}u";
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = output is null;
@@ -138,32 +138,21 @@ public void UpdateState(BoundUserInterfaceState state)
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
-            if (state.BufferCurrentVolume == 0)
+            if (state.BufferOutputVolume == 0)
                 return "";
 
-            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
+            var reagent = state.BufferOutputReagents.OrderBy(r => r.Quantity).Last().Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
 
-        /// <summary>
-        /// Update the container, buffer, and packaging panels.
-        /// </summary>
-        /// <param name="state">State data for the dispenser.</param>
-        private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
+        private void UpdateBufferInfo(BoxContainer bufferInfo, IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2? bufferVolume, bool isStorageBuffer, string bufferName)
         {
-            BufferTransferButton.Pressed = state.Mode == ChemMasterMode.Transfer;
-            BufferDiscardButton.Pressed = state.Mode == ChemMasterMode.Discard;
+            bufferInfo.Children.Clear();
 
-            BuildContainerUI(InputContainerInfo, state.InputContainerInfo, true);
-            BuildContainerUI(OutputContainerInfo, state.OutputContainerInfo, false);
-
-            BufferInfo.Children.Clear();
-
-            if (!state.BufferReagents.Any())
+            if (!bufferReagents.Any())
             {
-                BufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
-
+                bufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
                 return;
             }
 
@@ -171,26 +160,25 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
             {
                 Orientation = LayoutOrientation.Horizontal
             };
-            BufferInfo.AddChild(bufferHBox);
+            bufferInfo.AddChild(bufferHBox);
 
             var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " };
             bufferHBox.AddChild(bufferLabel);
             var bufferVol = new Label
             {
-                Text = $"{state.BufferCurrentVolume}u",
-                StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
+                Text = $"{bufferVolume}u",
+                StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
             };
             bufferHBox.AddChild(bufferVol);
 
-            foreach (var (reagent, quantity) in state.BufferReagents)
+            foreach (var (reagent, quantity) in bufferReagents)
             {
-                // Try to get the prototype for the given reagent. This gives us its name.
                 _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
                 var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
 
                 if (proto != null)
                 {
-                    BufferInfo.Children.Add(new BoxContainer
+                    bufferInfo.Children.Add(new BoxContainer
                     {
                         Orientation = LayoutOrientation.Horizontal,
                         Children =
@@ -205,19 +193,36 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
                             // Padding
                             new Control {HorizontalExpand = true},
 
-                            MakeReagentButton("1", ChemMasterReagentAmount.U1, reagent, true, StyleBase.ButtonOpenRight),
-                            MakeReagentButton("5", ChemMasterReagentAmount.U5, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("10", ChemMasterReagentAmount.U10, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("25", ChemMasterReagentAmount.U25, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("50", ChemMasterReagentAmount.U50, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("100", ChemMasterReagentAmount.U100, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton(Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, reagent, true, StyleBase.ButtonOpenLeft),
+                            MakeReagentButton("1", ChemMasterReagentAmount.U1, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenRight),
+                            MakeReagentButton("5", ChemMasterReagentAmount.U5, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenBoth),
+                            MakeReagentButton("10", ChemMasterReagentAmount.U10, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenBoth),
+                            MakeReagentButton("25", ChemMasterReagentAmount.U25, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenBoth),
+                            MakeReagentButton("50", ChemMasterReagentAmount.U50, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenBoth),
+                            MakeReagentButton("100", ChemMasterReagentAmount.U100, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenBoth),
+                            MakeReagentButton(Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, reagent, isStorageBuffer, bufferName, StyleBase.ButtonOpenLeft),
                         }
                     });
                 }
             }
         }
 
+        /// <summary>
+        /// Update the container, buffer, and packaging panels.
+        /// </summary>
+        /// <param name="state">State data for the dispenser.</param>
+        private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
+        {
+            BufferStorageButton.Pressed = state.Mode == ChemMasterMode.Storage;
+            BufferOutputButton.Pressed = state.Mode == ChemMasterMode.Output;
+            BufferDiscardButton.Pressed = state.Mode == ChemMasterMode.Discard;
+
+            BuildContainerUI(InputContainerInfo, state.InputContainerInfo, true);
+            BuildContainerUI(OutputContainerInfo, state.OutputContainerInfo, false);
+
+            UpdateBufferInfo(StorageBufferInfo, state.BufferStorageReagents, state.BufferStorageVolume, true, SharedChemMaster.StorageBufferSolutionName);
+            UpdateBufferInfo(OutputBufferInfo, state.BufferOutputReagents, state.BufferOutputVolume, false, SharedChemMaster.OutputBufferSolutionName);
+        }
+
         private void BuildContainerUI(Control control, ContainerInfo? info, bool addReagentButtons)
         {
             control.Children.Clear();
@@ -294,20 +299,20 @@ private void BuildContainerUI(Control control, ContainerInfo? info, bool addReag
                         cs.Add(new Control { HorizontalExpand = true });
 
                         cs.Add(MakeReagentButton(
-                            "1", ChemMasterReagentAmount.U1, id, false, StyleBase.ButtonOpenRight));
+                            "1", ChemMasterReagentAmount.U1, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenRight));
                         cs.Add(MakeReagentButton(
-                            "5", ChemMasterReagentAmount.U5, id, false, StyleBase.ButtonOpenBoth));
+                            "5", ChemMasterReagentAmount.U5, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenBoth));
                         cs.Add(MakeReagentButton(
-                            "10", ChemMasterReagentAmount.U10, id, false, StyleBase.ButtonOpenBoth));
+                            "10", ChemMasterReagentAmount.U10, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenBoth));
                         cs.Add(MakeReagentButton(
-                            "25", ChemMasterReagentAmount.U25, id, false, StyleBase.ButtonOpenBoth));
+                            "25", ChemMasterReagentAmount.U25, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenBoth));
                         cs.Add(MakeReagentButton(
-                            "50", ChemMasterReagentAmount.U50, id, false, StyleBase.ButtonOpenBoth));
+                            "50", ChemMasterReagentAmount.U50, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenBoth));
                         cs.Add(MakeReagentButton(
-                            "100", ChemMasterReagentAmount.U100, id, false, StyleBase.ButtonOpenBoth));
+                            "100", ChemMasterReagentAmount.U100, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenBoth));
                         cs.Add(MakeReagentButton(
                             Loc.GetString("chem-master-window-buffer-all-amount"),
-                            ChemMasterReagentAmount.All, id, false, StyleBase.ButtonOpenLeft));
+                            ChemMasterReagentAmount.All, id, false, SharedChemMaster.InputSlotName, StyleBase.ButtonOpenLeft));
                     }
 
                     control.Children.Add(inner);
@@ -333,13 +338,15 @@ public sealed class ReagentButton : Button
     {
         public ChemMasterReagentAmount Amount { get; set; }
         public bool IsBuffer = true;
+        public string Origin { get; set; }
         public ReagentId Id { get; set; }
-        public ReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string styleClass)
+        public ReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string origin, string styleClass)
         {
             AddStyleClass(styleClass);
             Text = text;
             Amount = amount;
             Id = id;
+            Origin = origin;
             IsBuffer = isBuffer;
         }
     }
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index 9578755ba7..917deb843b 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class ChemMasterComponent : Component
         public uint PillType = 0;
 
         [DataField("mode"), ViewVariables(VVAccess.ReadWrite)]
-        public ChemMasterMode Mode = ChemMasterMode.Transfer;
+        public ChemMasterMode Mode = ChemMasterMode.Storage;
 
         [DataField("pillDosageLimit", required: true), ViewVariables(VVAccess.ReadWrite)]
         public uint PillDosageLimit;
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index c733c7215e..02066b024d 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -57,6 +57,7 @@ public override void Initialize()
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterReagentAmountButtonMessage>(OnReagentButtonMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterCreatePillsMessage>(OnCreatePillsMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputToBottleMessage>(OnOutputToBottleMessage);
+            SubscribeLocalEvent<ChemMasterComponent, ChemMasterDiscardBufferMessage>(OnDiscardBufferMessage);
         }
 
         private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev)
@@ -67,17 +68,22 @@ private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev
         private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = false)
         {
             var (owner, chemMaster) = ent;
-            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
+            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.StorageBufferSolutionName, out _, out var bufferStorageSolution))
+                return;
+            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.OutputBufferSolutionName, out _, out var bufferOutputSolution))
                 return;
             var inputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.InputSlotName);
             var outputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.OutputSlotName);
 
-            var bufferReagents = bufferSolution.Contents;
-            var bufferCurrentVolume = bufferSolution.Volume;
+            var bufferStorageReagents = bufferStorageSolution.Contents;
+            var bufferStorageVolume = bufferStorageSolution.Volume;
+
+            var bufferOutputReagents = bufferOutputSolution.Contents;
+            var bufferOutputVolume = bufferOutputSolution.Volume;
 
             var state = new ChemMasterBoundUserInterfaceState(
                 chemMaster.Mode, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer),
-                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
+                bufferStorageReagents, bufferOutputReagents, bufferStorageVolume, bufferOutputVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -112,11 +118,14 @@ private void OnReagentButtonMessage(Entity<ChemMasterComponent> chemMaster, ref
 
             switch (chemMaster.Comp.Mode)
             {
-                case ChemMasterMode.Transfer:
-                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer);
+                case ChemMasterMode.Storage:
+                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, message.Origin);
+                    break;
+                case ChemMasterMode.Output:
+                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, message.Origin);
                     break;
                 case ChemMasterMode.Discard:
-                    DiscardReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer);
+                    DiscardReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, SharedChemMaster.StorageBufferSolutionName);
                     break;
                 default:
                     // Invalid mode.
@@ -126,38 +135,109 @@ private void OnReagentButtonMessage(Entity<ChemMasterComponent> chemMaster, ref
             ClickSound(chemMaster);
         }
 
-        private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
+        public void OnDiscardBufferMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterDiscardBufferMessage message)
         {
-            var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
-            if (container is null ||
-                !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
-                !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
+            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, message.BufferName, out var containerSolution, out var bufferSolution))
             {
                 return;
             }
 
-            if (fromBuffer) // Buffer to container
+            _solutionContainerSystem.RemoveAllSolution(containerSolution.Value);
+
+            UpdateUiState(chemMaster, updateLabel: true);
+            ClickSound(chemMaster);
+        }
+
+        // Transfer reagents from the container to one of the buffers, or between buffers depending on the mode and origin.
+        // Output buffer can't transfer back to container, only to storage buffer.
+        private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer, string origin)
+        {
+            // Input Slot to Storage Buffer
+            if (origin == SharedChemMaster.InputSlotName && chemMaster.Comp.Mode == ChemMasterMode.Storage)
             {
-                amount = FixedPoint2.Min(amount, containerSolution.AvailableVolume);
-                amount = bufferSolution.RemoveReagent(id, amount, preserveOrder: true);
+                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
+                if (container is null ||
+                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
+                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var bufferSolution))
+                {
+                    return;
+                }
+
+                amount = FixedPoint2.Min(amount, containerSolution.GetReagentQuantity(id));
+                _solutionContainerSystem.RemoveReagent(containerSoln.Value, id, amount);
+                bufferSolution.AddReagent(id, amount);
+            }
+            // Storage Buffer to Input Slot
+            else if (origin == SharedChemMaster.StorageBufferSolutionName && chemMaster.Comp.Mode == ChemMasterMode.Storage)
+            {
+                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
+                if (container is null ||
+                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
+                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var bufferSolution))
+                {
+                    return;
+                }
+
+                amount = FixedPoint2.Min(amount, bufferSolution.GetReagentQuantity(id));
+                bufferSolution.RemoveReagent(id, amount);
                 _solutionContainerSystem.TryAddReagent(containerSoln.Value, id, amount, out var _);
+
             }
-            else // Container to buffer
+            // Input Slot to Output Buffer
+            else if (origin == SharedChemMaster.InputSlotName && chemMaster.Comp.Mode == ChemMasterMode.Output)
             {
+                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
+                if (container is null ||
+                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
+                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var bufferSolution))
+                {
+                    return;
+                }
+
                 amount = FixedPoint2.Min(amount, containerSolution.GetReagentQuantity(id));
                 _solutionContainerSystem.RemoveReagent(containerSoln.Value, id, amount);
                 bufferSolution.AddReagent(id, amount);
             }
+            // Storage Buffer to Output Buffer
+            else if (origin == SharedChemMaster.StorageBufferSolutionName && chemMaster.Comp.Mode == ChemMasterMode.Output)
+            {
+                if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var storageBufferSolution) ||
+                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var outputBufferSolution))
+                {
+                    return;
+                }
+
+                amount = FixedPoint2.Min(amount, storageBufferSolution.GetReagentQuantity(id));
+                storageBufferSolution.RemoveReagent(id, amount);
+                outputBufferSolution.AddReagent(id, amount);
+            }
+            // Output buffer to Storage Buffer
+            else if (origin == SharedChemMaster.OutputBufferSolutionName)
+            {
+                if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var outputBufferSolution) ||
+                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var storageBufferSolution))
+                {
+                    return;
+                }
+
+                amount = FixedPoint2.Min(amount, outputBufferSolution.GetReagentQuantity(id));
+                outputBufferSolution.RemoveReagent(id, amount, preserveOrder: true);
+                storageBufferSolution.AddReagent(id, amount);
+            }
+            else
+            {
+                return;
+            }
 
             UpdateUiState(chemMaster, updateLabel: true);
         }
 
-        private void DiscardReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
+        private void DiscardReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer, string bufferName)
         {
             if (fromBuffer)
             {
-                if (_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
-                    bufferSolution.RemoveReagent(id, amount, preserveOrder: true);
+                if (_solutionContainerSystem.TryGetSolution(chemMaster.Owner, bufferName, out _, out var bufferStorageSolution))
+                    bufferStorageSolution.RemoveReagent(id, amount, preserveOrder: true);
                 else
                     return;
             }
@@ -199,7 +279,7 @@ private void OnCreatePillsMessage(Entity<ChemMasterComponent> chemMaster, ref Ch
                 return;
 
             var needed = message.Dosage * message.Number;
-            if (!WithdrawFromBuffer(chemMaster, needed, user, out var withdrawal))
+            if (!WithdrawFromBuffer(chemMaster, needed, user, SharedChemMaster.OutputBufferSolutionName, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -247,7 +327,7 @@ private void OnOutputToBottleMessage(Entity<ChemMasterComponent> chemMaster, ref
             if (message.Label.Length > SharedChemMaster.LabelMaxLength)
                 return;
 
-            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, out var withdrawal))
+            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, SharedChemMaster.OutputBufferSolutionName, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -264,11 +344,12 @@ private void OnOutputToBottleMessage(Entity<ChemMasterComponent> chemMaster, ref
         private bool WithdrawFromBuffer(
             Entity<ChemMasterComponent> chemMaster,
             FixedPoint2 neededVolume, EntityUid? user,
+            string bufferName,
             [NotNullWhen(returnValue: true)] out Solution? outputSolution)
         {
             outputSolution = null;
 
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var solution))
+            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, bufferName, out _, out var solution))
             {
                 return false;
             }
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index 762131d761..4798b923e1 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -10,7 +10,9 @@ namespace Content.Shared.Chemistry
     public sealed class SharedChemMaster
     {
         public const uint PillTypes = 20;
-        public const string BufferSolutionName = "buffer";
+        public const string StorageBufferSolutionName = "storageBuffer";
+
+        public const string OutputBufferSolutionName = "outputBuffer";
         public const string InputSlotName = "beakerSlot";
         public const string OutputSlotName = "outputSlot";
         public const string PillSolutionName = "food";
@@ -46,12 +48,14 @@ public sealed class ChemMasterReagentAmountButtonMessage : BoundUserInterfaceMes
         public readonly ReagentId ReagentId;
         public readonly ChemMasterReagentAmount Amount;
         public readonly bool FromBuffer;
+        public readonly string Origin;
 
-        public ChemMasterReagentAmountButtonMessage(ReagentId reagentId, ChemMasterReagentAmount amount, bool fromBuffer)
+        public ChemMasterReagentAmountButtonMessage(ReagentId reagentId, ChemMasterReagentAmount amount, bool fromBuffer, string origin)
         {
             ReagentId = reagentId;
             Amount = amount;
             FromBuffer = fromBuffer;
+            Origin = origin;
         }
     }
 
@@ -83,9 +87,21 @@ public ChemMasterOutputToBottleMessage(uint dosage, string label)
         }
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ChemMasterDiscardBufferMessage : BoundUserInterfaceMessage
+    {
+        public readonly string BufferName;
+
+        public ChemMasterDiscardBufferMessage(string bufferName)
+        {
+            BufferName = bufferName;
+        }
+    }
+
     public enum ChemMasterMode
     {
-        Transfer,
+        Storage,
+        Output,
         Discard,
     }
 
@@ -156,11 +172,15 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
         /// <summary>
         /// A list of the reagents and their amounts within the buffer, if applicable.
         /// </summary>
-        public readonly IReadOnlyList<ReagentQuantity> BufferReagents;
+        public readonly IReadOnlyList<ReagentQuantity> BufferStorageReagents;
+
+        public readonly IReadOnlyList<ReagentQuantity> BufferOutputReagents;
 
         public readonly ChemMasterMode Mode;
 
-        public readonly FixedPoint2? BufferCurrentVolume;
+        public readonly FixedPoint2? BufferStorageVolume;
+
+        public readonly FixedPoint2? BufferOutputVolume;
         public readonly uint SelectedPillType;
 
         public readonly uint PillDosageLimit;
@@ -169,14 +189,17 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
 
         public ChemMasterBoundUserInterfaceState(
             ChemMasterMode mode, ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
-            IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
+            IReadOnlyList<ReagentQuantity> bufferStorageReagents, IReadOnlyList<ReagentQuantity> bufferOutputReagents,
+            FixedPoint2 bufferStorageVolume, FixedPoint2 bufferOutputVolume,
             uint selectedPillType, uint pillDosageLimit, bool updateLabel)
         {
             InputContainerInfo = inputContainerInfo;
             OutputContainerInfo = outputContainerInfo;
-            BufferReagents = bufferReagents;
+            BufferStorageReagents = bufferStorageReagents;
+            BufferOutputReagents = bufferOutputReagents;
             Mode = mode;
-            BufferCurrentVolume = bufferCurrentVolume;
+            BufferStorageVolume = bufferStorageVolume;
+            BufferOutputVolume = bufferOutputVolume;
             SelectedPillType = selectedPillType;
             PillDosageLimit = pillDosageLimit;
             UpdateLabel = updateLabel;
diff --git a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
index 51110f12c4..b7da014f41 100644
--- a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
@@ -13,12 +13,14 @@ chem-master-window-output-tab = Output
 chem-master-window-container-label = Container
 chem-master-window-eject-button = Eject
 chem-master-window-no-container-loaded-text = No container loaded.
-chem-master-window-buffer-text = Buffer
+chem-master-window-buffer-text = Storage Buffer
+chem-master-window-output-buffer-text = Output Buffer
 chem-master-window-buffer-label = buffer:
 chem-master-window-buffer-all-amount = All
 chem-master-window-buffer-empty-text = Buffer empty.
 chem-master-window-buffer-low-text = Not enough solution in buffer
-chem-master-window-transfer-button = Transfer
+chem-master-window-storage-button = Storage
+chem-master-window-output-button = Output
 chem-master-window-discard-button = Discard
 chem-master-window-packaging-text = Packaging
 chem-master-current-text-label = Label:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index d78ed1182c..3d3e8efdb2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -85,9 +85,10 @@
           - PillCanister
   - type: SolutionContainerManager
     solutions:
-      buffer: {}
+      storageBuffer: {}
+      outputBuffer: {}
   - type: DumpableSolution
-    solution: buffer
+    solution: storageBuffer
     unlimited: true
   - type: GuideHelp
     guides: