diff --git a/common/src/main/java/muramasa/gregtech/data/Guis.java b/common/src/main/java/muramasa/gregtech/data/Guis.java
index 9804403a4d..a3cc39ae2b 100644
--- a/common/src/main/java/muramasa/gregtech/data/Guis.java
+++ b/common/src/main/java/muramasa/gregtech/data/Guis.java
@@ -152,6 +152,12 @@ public static void init(Side side) {
         FORMING_PRESS.add(ALLOY_SMELTER).getGui().getMachineData().setProgressLocation("compressor");
         FORGE_HAMMER.add(FURNACE).getGui().setBackgroundTexture("machine_forge_hammer").getMachineData().setProgressLocation("forge_hammer");
         SUPER_BUFFER.getGui().setBackgroundTexture("super_buffer");
+        CHEST_BUFFER.getGui().setBackgroundTexture("chest_buffer");
+        for (int y = 0; y < 3; y++){
+            for (int x = 0; x < 9; x++){
+                CHEST_BUFFER.add(STORAGE, 8 + (x * 18), 5 + (y * 18));
+            }
+        }
         SIFTER.add(IT_IN, 53, 25)
                 .add(IT_OUT, 107, 16).add(IT_OUT, 125, 16).add(IT_OUT, 143, 16)
                 .add(IT_OUT, 107, 34).add(IT_OUT, 125, 34).add(IT_OUT, 143, 34)
diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
index e3e00692ee..bf945a2a6f 100644
--- a/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
+++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
@@ -458,6 +458,11 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
                             .put('D', DataOrb)
                             .put('M', hull)
                             .put('C', conveyor).build(), "DMC"));
+            add(CHEST_BUFFER, tier, (m, item) -> provider.addItemRecipe(output, "machines", "has_motor", provider.hasSafeItem(motor), item,
+                    ImmutableMap.<Character, Object>builder()
+                            .put('D', ForgeCTags.CHESTS_WOODEN)
+                            .put('M', hull)
+                            .put('C', conveyor).put('c', circuit).build(), "DMC", " c "));
             if (!AntimatterAPI.isModLoaded("gt4r")){
                 add(ELECTRIC_TYPE_FILTER, tier, (m,item) -> provider.addItemRecipe(output, "machines", "has_motor", provider.hasSafeItem(MotorHV), item,
                         ImmutableMap.<Character, Object>builder()
diff --git a/common/src/main/java/muramasa/gregtech/tile/single/TileEntityBuffer.java b/common/src/main/java/muramasa/gregtech/tile/single/TileEntityBuffer.java
index 76d981eed3..a80442bc1d 100644
--- a/common/src/main/java/muramasa/gregtech/tile/single/TileEntityBuffer.java
+++ b/common/src/main/java/muramasa/gregtech/tile/single/TileEntityBuffer.java
@@ -141,6 +141,7 @@ public BufferItemHandler(TileEntityBuffer tile) {
                 @NotNull
                 @Override
                 public ItemStack extractItem(int slot, int amount, boolean simulate) {
+                    if (amount < tile.stackLimit) return ItemStack.EMPTY;
                     amount = Math.min(amount, tile.stackLimit);
                     return super.extractItem(slot, amount, simulate);
                 }
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/back.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/back.png
new file mode 100644
index 0000000000..c3d7a1d129
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/back.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/bottom.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/bottom.png
new file mode 100644
index 0000000000..6164bf0282
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/bottom.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/front.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/front.png
new file mode 100644
index 0000000000..930e645b55
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/front.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/left.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/side.png
similarity index 100%
rename from common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/left.png
rename to common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/side.png
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/top.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/top.png
new file mode 100644
index 0000000000..8f6995a9ac
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/active/top.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/back.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/back.png
new file mode 100644
index 0000000000..c3d7a1d129
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/back.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/bottom.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/bottom.png
new file mode 100644
index 0000000000..6164bf0282
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/bottom.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/front.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/front.png
new file mode 100644
index 0000000000..930e645b55
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/front.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/left.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/side.png
similarity index 100%
rename from common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/left.png
rename to common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/side.png
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/top.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/top.png
new file mode 100644
index 0000000000..8f6995a9ac
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/chest_buffer/top.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/right.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/side.png
similarity index 64%
rename from common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/right.png
rename to common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/side.png
index f4ee7ebfe2..2411bd5aab 100644
Binary files a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/right.png and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/active/side.png differ
diff --git a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/right.png b/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/side.png
similarity index 64%
rename from common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/right.png
rename to common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/side.png
index f4ee7ebfe2..2411bd5aab 100644
Binary files a/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/right.png and b/common/src/main/resources/assets/gti/textures/block/machine/overlay/super_buffer/side.png differ
diff --git a/common/src/main/resources/assets/gti/textures/gui/background/chest_buffer.png b/common/src/main/resources/assets/gti/textures/gui/background/chest_buffer.png
new file mode 100644
index 0000000000..bb66203449
Binary files /dev/null and b/common/src/main/resources/assets/gti/textures/gui/background/chest_buffer.png differ