diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb444c81..4b5fba704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
+-   Disk Interface (formerly known as the "Disk Manipulator").
 -   Item tag translations.
 
+### Fixed
+
+-   Relay having no help tooltip.
+-   Fixed bug where adding more Speed Upgrades would actually slow down the device even more.
+
 ## [2.0.0-milestone.3.13] - 2024-06-16
 
 ## [2.0.0-milestone.3.12] - 2024-06-16
diff --git a/config/intellij-code-style.xml b/config/intellij-code-style.xml
index 9a82b0fd0..49b79c2e9 100644
--- a/config/intellij-code-style.xml
+++ b/config/intellij-code-style.xml
@@ -1,5 +1,7 @@
 <code_scheme name="Refined Mods" version="173">
   <JavaCodeStyleSettings>
+    <option name="GENERATE_FINAL_LOCALS" value="true" />
+    <option name="GENERATE_FINAL_PARAMETERS" value="true" />
     <option name="SPACE_INSIDE_ONE_LINE_ENUM_BRACES" value="true" />
     <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java
index 5258c2dfc..ab85afb5d 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java
@@ -1,6 +1,5 @@
 package com.refinedmods.refinedstorage2.api.network.impl.node;
 
-import com.refinedmods.refinedstorage2.api.network.impl.storage.AbstractStorageNetworkNode;
 import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage;
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 import com.refinedmods.refinedstorage2.api.storage.StorageState;
@@ -17,12 +16,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractStorageContainerNetworkNode extends AbstractStorageNetworkNode {
+public abstract class AbstractStorageContainerNetworkNode extends AbstractNetworkNode {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStorageContainerNetworkNode.class);
 
     protected final StateTrackedStorage[] storages;
 
-    private final long energyUsage;
+    private long energyUsage;
     private final long energyUsagePerStorage;
 
     @Nullable
@@ -89,6 +88,10 @@ private void updateActiveStorageCount() {
         this.activeStorages = (int) Arrays.stream(storages).filter(Objects::nonNull).count();
     }
 
+    public void setEnergyUsage(final long energyUsage) {
+        this.energyUsage = energyUsage;
+    }
+
     @Override
     public long getEnergyUsage() {
         return energyUsage + (energyUsagePerStorage * activeStorages);
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java
index 7ea8a845b..7a9028ecb 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java
@@ -1,6 +1,8 @@
 package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage;
 
-import com.refinedmods.refinedstorage2.api.network.impl.storage.AbstractStorageNetworkNode;
+import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode;
+import com.refinedmods.refinedstorage2.api.network.impl.storage.NetworkNodeStorageConfiguration;
+import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration;
 import com.refinedmods.refinedstorage2.api.network.node.externalstorage.ExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider;
 import com.refinedmods.refinedstorage2.api.storage.Storage;
@@ -10,15 +12,21 @@
 import java.util.function.LongSupplier;
 import javax.annotation.Nullable;
 
-public class ExternalStorageNetworkNode extends AbstractStorageNetworkNode implements StorageProvider {
+public class ExternalStorageNetworkNode extends AbstractNetworkNode implements StorageProvider {
     private final long energyUsage;
+    private final StorageConfiguration storageConfiguration;
     private final ExposedExternalStorage storage;
     @Nullable
     private ExternalStorage externalStorage;
 
     public ExternalStorageNetworkNode(final long energyUsage, final LongSupplier clock) {
         this.energyUsage = energyUsage;
-        this.storage = new ExposedExternalStorage(this, clock);
+        this.storageConfiguration = new NetworkNodeStorageConfiguration(this);
+        this.storage = new ExposedExternalStorage(storageConfiguration, clock);
+    }
+
+    public StorageConfiguration getStorageConfiguration() {
+        return storageConfiguration;
     }
 
     public void setTrackingRepository(final TrackedStorageRepository trackingRepository) {
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java
index c0693fb68..0df45fbc0 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java
@@ -13,7 +13,7 @@
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 import com.refinedmods.refinedstorage2.api.storage.composite.CompositeAwareChild;
 import com.refinedmods.refinedstorage2.api.storage.composite.ParentComposite;
-import com.refinedmods.refinedstorage2.api.storage.composite.Priority;
+import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,7 +22,7 @@
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 
-class RelayOutputStorage implements CompositeAwareChild, ResourceListListener, Priority {
+class RelayOutputStorage implements CompositeAwareChild, ResourceListListener, PriorityProvider {
     private final Set<ParentComposite> parentComposites = new HashSet<>();
     private final Filter filter = new Filter();
 
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java
index b58b3cbb8..7a92a5971 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java
@@ -1,6 +1,8 @@
 package com.refinedmods.refinedstorage2.api.network.impl.node.storage;
 
 import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode;
+import com.refinedmods.refinedstorage2.api.network.impl.storage.NetworkNodeStorageConfiguration;
+import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration;
 import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider;
 import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage;
 import com.refinedmods.refinedstorage2.api.storage.Storage;
@@ -11,11 +13,13 @@
 public class StorageNetworkNode extends AbstractStorageContainerNetworkNode implements StorageProvider {
     private static final Logger LOGGER = LoggerFactory.getLogger(StorageNetworkNode.class);
 
+    private final StorageConfiguration storageConfiguration;
     private final ExposedStorage storage;
 
     public StorageNetworkNode(final long energyUsage, final long energyUsagePerStorage, final int size) {
         super(energyUsage, energyUsagePerStorage, size);
-        this.storage = new ExposedStorage(this);
+        this.storageConfiguration = new NetworkNodeStorageConfiguration(this);
+        this.storage = new ExposedStorage(storageConfiguration);
     }
 
     @Override
@@ -56,6 +60,10 @@ private void disableAllStorages() {
         storage.clearSources();
     }
 
+    public StorageConfiguration getStorageConfiguration() {
+        return storageConfiguration;
+    }
+
     public long getStored() {
         return storage.getStored();
     }
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java
index 58e8eed37..e431b2721 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java
@@ -1,6 +1,6 @@
 package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer;
 
 public enum StorageTransferMode {
-    INSERT,
-    EXTRACT
+    INSERT_INTO_NETWORK,
+    EXTRACT_FROM_NETWORK
 }
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java
index 0680ffccd..59fd6bace 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java
@@ -5,21 +5,27 @@
 import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent;
 import com.refinedmods.refinedstorage2.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage2.api.resource.filter.Filter;
+import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode;
 import com.refinedmods.refinedstorage2.api.storage.Actor;
+import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage;
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 import com.refinedmods.refinedstorage2.api.storage.TransferHelper;
 import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.function.ToLongFunction;
+import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 
 public class StorageTransferNetworkNode extends AbstractStorageContainerNetworkNode {
     private final Actor actor = new NetworkNodeActor(this);
+    private final Filter filter = new Filter();
 
-    private StorageTransferMode mode = StorageTransferMode.INSERT;
+    private StorageTransferMode mode = StorageTransferMode.INSERT_INTO_NETWORK;
     @Nullable
     private ToLongFunction<Storage> transferQuotaProvider;
     @Nullable
@@ -33,6 +39,10 @@ public void setMode(final StorageTransferMode mode) {
         this.mode = mode;
     }
 
+    public StorageTransferMode getMode() {
+        return mode;
+    }
+
     public void setTransferQuotaProvider(final ToLongFunction<Storage> transferQuotaProvider) {
         this.transferQuotaProvider = transferQuotaProvider;
     }
@@ -41,6 +51,22 @@ public void setListener(@Nullable final StorageTransferListener listener) {
         this.listener = listener;
     }
 
+    public FilterMode getFilterMode() {
+        return filter.getMode();
+    }
+
+    public void setFilterMode(final FilterMode filterMode) {
+        filter.setMode(filterMode);
+    }
+
+    public void setFilters(final Set<ResourceKey> filters) {
+        filter.setFilters(filters);
+    }
+
+    public void setNormalizer(final UnaryOperator<ResourceKey> normalizer) {
+        filter.setNormalizer(normalizer);
+    }
+
     @Override
     public void doWork() {
         super.doWork();
@@ -49,7 +75,7 @@ public void doWork() {
         }
         final StorageNetworkComponent networkStorage = network.getComponent(StorageNetworkComponent.class);
         for (int i = 0; i < storages.length / 2; ++i) {
-            final Storage storage = storages[i];
+            final StateTrackedStorage storage = storages[i];
             if (storage == null) {
                 continue;
             }
@@ -60,12 +86,12 @@ public void doWork() {
         }
     }
 
-    private Result transfer(final Storage storage, final StorageNetworkComponent networkStorage) {
+    private Result transfer(final StateTrackedStorage storage, final StorageNetworkComponent networkStorage) {
         if (transferQuotaProvider == null) {
             return Result.FAILURE;
         }
-        final long transferQuota = transferQuotaProvider.applyAsLong(storage);
-        if (mode == StorageTransferMode.INSERT) {
+        final long transferQuota = transferQuotaProvider.applyAsLong(storage.getDelegate());
+        if (mode == StorageTransferMode.INSERT_INTO_NETWORK) {
             return transfer(storage, networkStorage, transferQuota, this::hasNoExtractableResources);
         }
         return transfer(
@@ -96,7 +122,7 @@ private boolean transfer(final Storage source, final Storage destination, final
         final Collection<ResourceAmount> sourceContents = new LinkedHashSet<>(source.getAll());
         for (final ResourceAmount resourceAmount : sourceContents) {
             final ResourceKey resource = resourceAmount.getResource();
-            if (!isAllowed(resource)) {
+            if (!filter.isAllowed(resource)) {
                 continue;
             }
             final long amount = Math.min(remainder, resourceAmount.getAmount());
@@ -110,7 +136,7 @@ private boolean transfer(final Storage source, final Storage destination, final
     }
 
     private boolean hasNoExtractableResources(final Storage source) {
-        return source.getAll().stream().noneMatch(resourceAmount -> isAllowed(resourceAmount.getResource()));
+        return source.getAll().stream().noneMatch(resourceAmount -> filter.isAllowed(resourceAmount.getResource()));
     }
 
     private boolean storageIsFull(final Storage storage) {
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java
index 0d15bff67..cf4c35272 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java
@@ -8,7 +8,7 @@
 import com.refinedmods.refinedstorage2.api.storage.Actor;
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 import com.refinedmods.refinedstorage2.api.storage.composite.CompositeAwareChild;
-import com.refinedmods.refinedstorage2.api.storage.composite.Priority;
+import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -18,7 +18,8 @@
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4")
-public abstract class AbstractConfiguredProxyStorage<S extends Storage> implements CompositeAwareChild, Priority {
+public abstract class AbstractConfiguredProxyStorage<S extends Storage>
+    implements CompositeAwareChild, PriorityProvider {
     @Nullable
     private S delegate;
     private final StorageConfiguration config;
@@ -47,7 +48,10 @@ public Amount compositeInsert(final ResourceKey resource,
                                   final long amount,
                                   final Action action,
                                   final Actor actor) {
-        if (delegate == null || config.isExtractOnly() || !config.isActive() || !config.isAllowed(resource)) {
+        if (delegate == null
+            || config.getAccessMode().isExtractOnly()
+            || !config.isActive()
+            || !config.isAllowed(resource)) {
             return Amount.ZERO;
         }
         final long inserted = delegate.insert(resource, amount, action, actor);
@@ -62,7 +66,7 @@ public Amount compositeExtract(final ResourceKey resource,
                                    final long amount,
                                    final Action action,
                                    final Actor actor) {
-        if (delegate == null || config.isInsertOnly() || !config.isActive()) {
+        if (delegate == null || config.getAccessMode().isInsertOnly() || !config.isActive()) {
             return Amount.ZERO;
         }
         final long extracted = delegate.extract(resource, amount, action, actor);
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractStorageNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java
similarity index 78%
rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractStorageNetworkNode.java
rename to refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java
index c2cad2cd6..3e469fe36 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractStorageNetworkNode.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java
@@ -1,5 +1,6 @@
 package com.refinedmods.refinedstorage2.api.network.impl.storage;
 
+import com.refinedmods.refinedstorage2.api.network.Network;
 import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode;
 import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent;
 import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
@@ -10,18 +11,16 @@
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
-import org.apiguardian.api.API;
-
-@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4")
-public abstract class AbstractStorageNetworkNode extends AbstractNetworkNode implements StorageConfiguration {
+public class NetworkNodeStorageConfiguration implements StorageConfiguration {
+    private final AbstractNetworkNode node;
     private final Filter filter = new Filter();
+
     private int priority;
     private AccessMode accessMode = AccessMode.INSERT_EXTRACT;
     private boolean voidExcess;
 
-    @Override
-    public int getPriority() {
-        return priority;
+    public NetworkNodeStorageConfiguration(final AbstractNetworkNode node) {
+        this.node = node;
     }
 
     @Override
@@ -29,6 +28,16 @@ public AccessMode getAccessMode() {
         return accessMode;
     }
 
+    @Override
+    public boolean isVoidExcess() {
+        return voidExcess;
+    }
+
+    @Override
+    public void setVoidExcess(final boolean voidExcess) {
+        this.voidExcess = voidExcess;
+    }
+
     @Override
     public void setAccessMode(final AccessMode accessMode) {
         this.accessMode = accessMode;
@@ -45,27 +54,28 @@ public boolean isAllowed(final ResourceKey resource) {
     }
 
     @Override
-    public void setFilterMode(final FilterMode mode) {
-        filter.setMode(mode);
+    public void setFilters(final Set<ResourceKey> filters) {
+        filter.setFilters(filters);
     }
 
     @Override
-    public void setPriority(final int priority) {
-        this.priority = priority;
-        trySortSources();
+    public void setNormalizer(final UnaryOperator<ResourceKey> normalizer) {
+        filter.setNormalizer(normalizer);
     }
 
     @Override
-    public boolean isVoidExcess() {
-        return voidExcess;
+    public void setFilterMode(final FilterMode filterMode) {
+        filter.setMode(filterMode);
     }
 
     @Override
-    public void setVoidExcess(final boolean voidExcess) {
-        this.voidExcess = voidExcess;
+    public void setPriority(final int priority) {
+        this.priority = priority;
+        trySortSources();
     }
 
     private void trySortSources() {
+        final Network network = node.getNetwork();
         if (network == null) {
             return;
         }
@@ -73,11 +83,13 @@ private void trySortSources() {
         storage.sortSources();
     }
 
-    public void setFilters(final Set<ResourceKey> filters) {
-        filter.setFilters(filters);
+    @Override
+    public int getPriority() {
+        return priority;
     }
 
-    public void setNormalizer(final UnaryOperator<ResourceKey> normalizer) {
-        filter.setNormalizer(normalizer);
+    @Override
+    public boolean isActive() {
+        return node.isActive();
     }
 }
diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java
index 518945726..f193264c9 100644
--- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java
+++ b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java
@@ -3,22 +3,17 @@
 import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode;
 import com.refinedmods.refinedstorage2.api.storage.AccessMode;
-import com.refinedmods.refinedstorage2.api.storage.composite.Priority;
+import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider;
+
+import java.util.Set;
+import java.util.function.UnaryOperator;
 
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4")
-public interface StorageConfiguration extends Priority {
+public interface StorageConfiguration extends PriorityProvider {
     AccessMode getAccessMode();
 
-    default boolean isInsertOnly() {
-        return getAccessMode() == AccessMode.INSERT;
-    }
-
-    default boolean isExtractOnly() {
-        return getAccessMode() == AccessMode.EXTRACT;
-    }
-
     boolean isVoidExcess();
 
     void setVoidExcess(boolean voidExcess);
@@ -29,6 +24,10 @@ default boolean isExtractOnly() {
 
     boolean isAllowed(ResourceKey resource);
 
+    void setFilters(Set<ResourceKey> filters);
+
+    void setNormalizer(UnaryOperator<ResourceKey> normalizer);
+
     void setFilterMode(FilterMode filterMode);
 
     void setPriority(int priority);
diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java
index 218848016..0ecdbe604 100644
--- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java
+++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java
@@ -56,10 +56,10 @@ void testInitialState(@InjectNetworkStorageComponent final StorageNetworkCompone
         // Assert
         assertThat(inserted).isZero();
         assertThat(extracted).isZero();
-        assertThat(sut.getAccessMode()).isEqualTo(AccessMode.INSERT_EXTRACT);
+        assertThat(sut.getStorageConfiguration().getAccessMode()).isEqualTo(AccessMode.INSERT_EXTRACT);
         assertThat(sut.getEnergyUsage()).isEqualTo(ENERGY_USAGE);
-        assertThat(sut.getPriority()).isZero();
-        assertThat(sut.getFilterMode()).isEqualTo(FilterMode.BLOCK);
+        assertThat(sut.getStorageConfiguration().getPriority()).isZero();
+        assertThat(sut.getStorageConfiguration().getFilterMode()).isEqualTo(FilterMode.BLOCK);
         assertThat(networkStorage.getAll()).isEmpty();
         assertThat(networkStorage.getStored()).isZero();
         assertThat(networkStorage.findTrackedResourceByActorType(A, FakeActor.class)).isEmpty();
@@ -157,8 +157,8 @@ void shouldExtract(@InjectNetworkStorageComponent final StorageNetworkComponent
     void shouldRespectAllowlistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage) {
         // Arrange
-        sut.setFilterMode(FilterMode.ALLOW);
-        sut.setFilters(Set.of(A, B));
+        sut.getStorageConfiguration().setFilterMode(FilterMode.ALLOW);
+        sut.getStorageConfiguration().setFilters(Set.of(A, B));
 
         final Storage storage = new InMemoryStorageImpl();
         final ExternalStorageProvider provider = new StorageExternalStorageProvider(storage);
@@ -180,8 +180,8 @@ void shouldRespectEmptyAllowlistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.ALLOW);
-        sut.setFilters(Set.of());
+        sut.getStorageConfiguration().setFilterMode(FilterMode.ALLOW);
+        sut.getStorageConfiguration().setFilters(Set.of());
 
         final Storage storage = new InMemoryStorageImpl();
         final ExternalStorageProvider provider = new StorageExternalStorageProvider(storage);
@@ -202,8 +202,8 @@ void shouldRespectEmptyAllowlistWhenInserting(
     void shouldRespectBlocklistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage) {
         // Arrange
-        sut.setFilterMode(FilterMode.BLOCK);
-        sut.setFilters(Set.of(A, B));
+        sut.getStorageConfiguration().setFilterMode(FilterMode.BLOCK);
+        sut.getStorageConfiguration().setFilters(Set.of(A, B));
 
         final Storage storage = new InMemoryStorageImpl();
         final ExternalStorageProvider provider = new StorageExternalStorageProvider(storage);
@@ -224,8 +224,8 @@ void shouldRespectBlocklistWhenInserting(
     void shouldRespectEmptyBlocklistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage) {
         // Arrange
-        sut.setFilterMode(FilterMode.BLOCK);
-        sut.setFilters(Set.of());
+        sut.getStorageConfiguration().setFilterMode(FilterMode.BLOCK);
+        sut.getStorageConfiguration().setFilters(Set.of());
 
         final Storage storage = new InMemoryStorageImpl();
         final ExternalStorageProvider provider = new StorageExternalStorageProvider(storage);
@@ -249,7 +249,7 @@ void shouldRespectAccessModeWhenInserting(final AccessMode accessMode,
                                               final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setAccessMode(accessMode);
+        sut.getStorageConfiguration().setAccessMode(accessMode);
 
         final Storage storage = new InMemoryStorageImpl();
         final ExternalStorageProvider provider = new StorageExternalStorageProvider(storage);
@@ -272,7 +272,7 @@ void shouldRespectAccessModeWhenExtracting(final AccessMode accessMode,
                                                final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setAccessMode(accessMode);
+        sut.getStorageConfiguration().setAccessMode(accessMode);
 
         final Storage storage = new InMemoryStorageImpl();
         storage.insert(A, 20, Action.EXECUTE, EmptyActor.INSTANCE);
@@ -647,11 +647,11 @@ void shouldRespectPriority(final boolean oneHasPriority,
             otherStorage.initialize(new ExternalStorageProviderFactoryImpl(provider2));
 
             if (oneHasPriority) {
-                sut.setPriority(5);
-                otherStorage.setPriority(2);
+                sut.getStorageConfiguration().setPriority(5);
+                otherStorage.getStorageConfiguration().setPriority(2);
             } else {
-                sut.setPriority(2);
-                otherStorage.setPriority(5);
+                sut.getStorageConfiguration().setPriority(2);
+                otherStorage.getStorageConfiguration().setPriority(5);
             }
 
             // Act
diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java
index f1761eac5..af1a17426 100644
--- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java
+++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java
@@ -54,11 +54,11 @@ void shouldRespectPriority(
         b.setActive(true);
 
         if (storageAHasPriority) {
-            a.setPriority(5);
-            b.setPriority(2);
+            a.getStorageConfiguration().setPriority(5);
+            b.getStorageConfiguration().setPriority(2);
         } else {
-            a.setPriority(2);
-            b.setPriority(5);
+            a.getStorageConfiguration().setPriority(2);
+            b.getStorageConfiguration().setPriority(5);
         }
 
         // Act
diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java
index 441da0459..aa100309b 100644
--- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java
+++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java
@@ -131,7 +131,7 @@ void shouldInitializeMultipleTimes(
     void testInitialState(@InjectNetworkStorageComponent final StorageNetworkComponent networkStorage) {
         // Assert
         assertThat(sut.getEnergyUsage()).isEqualTo(BASE_USAGE);
-        assertThat(sut.getFilterMode()).isEqualTo(FilterMode.BLOCK);
+        assertThat(sut.getStorageConfiguration().getFilterMode()).isEqualTo(FilterMode.BLOCK);
         assertThat(networkStorage.getAll()).isEmpty();
         assertThat(networkStorage.getStored()).isZero();
         assertThat(sut.getSize()).isEqualTo(9);
@@ -396,8 +396,8 @@ void shouldRespectAllowlistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.ALLOW);
-        sut.setFilters(Set.of(A, B));
+        sut.getStorageConfiguration().setFilterMode(FilterMode.ALLOW);
+        sut.getStorageConfiguration().setFilters(Set.of(A, B));
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
@@ -419,9 +419,9 @@ void shouldRespectAllowlistWithNormalizerWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.ALLOW);
-        sut.setFilters(Set.of(A));
-        sut.setNormalizer(resource -> {
+        sut.getStorageConfiguration().setFilterMode(FilterMode.ALLOW);
+        sut.getStorageConfiguration().setFilters(Set.of(A));
+        sut.getStorageConfiguration().setNormalizer(resource -> {
             if (resource == A_ALTERNATIVE || resource == A_ALTERNATIVE2) {
                 return A;
             }
@@ -455,8 +455,8 @@ void shouldRespectEmptyAllowlistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.ALLOW);
-        sut.setFilters(Set.of());
+        sut.getStorageConfiguration().setFilterMode(FilterMode.ALLOW);
+        sut.getStorageConfiguration().setFilters(Set.of());
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
@@ -478,8 +478,8 @@ void shouldRespectBlocklistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.BLOCK);
-        sut.setFilters(Set.of(A, B));
+        sut.getStorageConfiguration().setFilterMode(FilterMode.BLOCK);
+        sut.getStorageConfiguration().setFilters(Set.of(A, B));
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
@@ -501,8 +501,8 @@ void shouldRespectEmptyBlocklistWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setFilterMode(FilterMode.BLOCK);
-        sut.setFilters(Set.of());
+        sut.getStorageConfiguration().setFilterMode(FilterMode.BLOCK);
+        sut.getStorageConfiguration().setFilters(Set.of());
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
@@ -526,7 +526,7 @@ void shouldRespectAccessModeWhenInserting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setAccessMode(accessMode);
+        sut.getStorageConfiguration().setAccessMode(accessMode);
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
@@ -549,7 +549,7 @@ void shouldRespectAccessModeWhenExtracting(
         @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage
     ) {
         // Arrange
-        sut.setAccessMode(accessMode);
+        sut.getStorageConfiguration().setAccessMode(accessMode);
 
         final Storage storage = new LimitedStorageImpl(100);
         provider.set(1, storage);
diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java
index 0249b8f3e..8cc1dee94 100644
--- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java
+++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java
@@ -419,7 +419,7 @@ void shouldExtract(@InjectNetworkStorageComponent final StorageNetworkComponent
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 20L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
@@ -455,7 +455,7 @@ void shouldExtractAllowlist(@InjectNetworkStorageComponent final StorageNetworkC
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 20L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
         sut.setFilterMode(FilterMode.ALLOW);
         sut.setFilters(Set.of(A, B));
 
@@ -492,7 +492,7 @@ void shouldExtractBlocklist(@InjectNetworkStorageComponent final StorageNetworkC
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 20L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
         sut.setFilterMode(FilterMode.BLOCK);
         sut.setFilters(Set.of(A, B));
 
@@ -521,7 +521,7 @@ void shouldNotifyListenerWhenReadyExtractingBecauseStorageWasAlreadyEmpty() {
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 15L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
@@ -545,7 +545,7 @@ void shouldNotifyListenerWhenReadyExtractingAllResources(
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 15L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
@@ -577,7 +577,7 @@ void shouldNotifyListenerWhenReadyExtractingAllResourcesAndUsingFilterButInserte
         sut.setTransferQuotaProvider(storage -> 15L);
         sut.setFilterMode(FilterMode.ALLOW);
         sut.setFilters(Set.of(A));
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
@@ -609,7 +609,7 @@ void shouldNotifyListenerWhenReadyExtractingAllResourcesAndUsingFilterButStillEx
         sut.setTransferQuotaProvider(storage -> 15L);
         sut.setFilterMode(FilterMode.ALLOW);
         sut.setFilters(Set.of(A));
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
@@ -640,7 +640,7 @@ void shouldNotifyListenerWhenExtractingAllResourcesAndReachingCapacity(
 
         sut.setProvider(provider);
         sut.setTransferQuotaProvider(storage -> 100L);
-        sut.setMode(StorageTransferMode.EXTRACT);
+        sut.setMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
 
         // Act
         sut.doWork();
diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java
index b66fd0588..9d33a3bfa 100644
--- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java
+++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java
@@ -3,6 +3,7 @@
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 
 import java.util.Optional;
+import java.util.function.Predicate;
 
 import net.minecraft.world.item.ItemStack;
 import org.apiguardian.api.API;
@@ -12,4 +13,8 @@ public interface StorageContainerItem {
     Optional<Storage> resolve(StorageRepository storageRepository, ItemStack stack);
 
     Optional<StorageInfo> getInfo(StorageRepository storageRepository, ItemStack stack);
+
+    static Predicate<ItemStack> stackValidator() {
+        return stack -> stack.getItem() instanceof StorageContainerItem;
+    }
 }
diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java
index e1ddbbf85..af53007ed 100644
--- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java
+++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java
@@ -17,4 +17,6 @@ public interface StorageType {
     CompoundTag toTag(Storage storage);
 
     boolean isAllowed(ResourceKey resource);
+
+    long getDiskInterfaceTransferQuota(boolean stackUpgrade);
 }
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json
new file mode 100644
index 000000000..2257e11c5
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/black_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/black_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json
new file mode 100644
index 000000000..41ca613dd
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/blue_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/blue_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json
new file mode 100644
index 000000000..e0ae1f4fc
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/brown_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/brown_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json
new file mode 100644
index 000000000..858d22003
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/cyan_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/cyan_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json
new file mode 100644
index 000000000..e1dd246f9
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/gray_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/gray_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json
new file mode 100644
index 000000000..cc710d923
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/green_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/green_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json
new file mode 100644
index 000000000..fb3a61b9a
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/light_blue_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/light_blue_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json
new file mode 100644
index 000000000..ab7a7dced
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/light_gray_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/light_gray_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json
new file mode 100644
index 000000000..2764afa20
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/lime_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/lime_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json
new file mode 100644
index 000000000..119f28827
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/magenta_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/magenta_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json
new file mode 100644
index 000000000..cf3152b32
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/orange_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/orange_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json
new file mode 100644
index 000000000..390609317
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/pink_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/pink_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json
new file mode 100644
index 000000000..9fe40f476
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/purple_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/purple_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json
new file mode 100644
index 000000000..f79298968
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/red_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/red_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json
new file mode 100644
index 000000000..d4a3b8de3
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/white_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/white_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json
new file mode 100644
index 000000000..bc490b195
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_disk_interfaces": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "refinedstorage2:coloring/yellow_disk_interface"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_disk_interfaces"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "refinedstorage2:coloring/yellow_disk_interface"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_disk_interface.json
new file mode 100644
index 000000000..08ff727bd
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:black_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/black_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_disk_interface.json
new file mode 100644
index 000000000..f4a5125a6
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:blue_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/blue_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_disk_interface.json
new file mode 100644
index 000000000..995cbabe6
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:brown_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/brown_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_disk_interface.json
new file mode 100644
index 000000000..21df5a33e
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:cyan_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/cyan_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/disk_interface.json
new file mode 100644
index 000000000..e248ac4d6
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_disk_interface.json
new file mode 100644
index 000000000..6c26b51f7
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:gray_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/gray_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_disk_interface.json
new file mode 100644
index 000000000..c276943c4
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:green_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/green_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_disk_interface.json
new file mode 100644
index 000000000..86fb8c088
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:light_gray_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/light_gray_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_disk_interface.json
new file mode 100644
index 000000000..b14c6fd0c
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:lime_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/lime_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_disk_interface.json
new file mode 100644
index 000000000..3f382a679
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:magenta_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/magenta_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_disk_interface.json
new file mode 100644
index 000000000..31d93f3a6
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:orange_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/orange_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_disk_interface.json
new file mode 100644
index 000000000..fb8d77572
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:pink_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/pink_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_disk_interface.json
new file mode 100644
index 000000000..1a19c8891
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:purple_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/purple_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_disk_interface.json
new file mode 100644
index 000000000..9d3ce96c5
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:red_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/red_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_disk_interface.json
new file mode 100644
index 000000000..1cdec3118
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:white_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/white_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_disk_interface.json
new file mode 100644
index 000000000..37d73407a
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_disk_interface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "refinedstorage2:yellow_disk_interface"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "refinedstorage2:blocks/yellow_disk_interface"
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json
new file mode 100644
index 000000000..8899166f8
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:black_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:black_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json
new file mode 100644
index 000000000..8fcd8ee90
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:blue_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:blue_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json
new file mode 100644
index 000000000..2137c39b4
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:brown_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:brown_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json
new file mode 100644
index 000000000..addc70460
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:cyan_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:cyan_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json
new file mode 100644
index 000000000..8deecdabf
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:gray_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:gray_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json
new file mode 100644
index 000000000..9b74acbb7
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:green_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:green_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json
new file mode 100644
index 000000000..89ea9102b
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:light_blue_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json
new file mode 100644
index 000000000..326986dc8
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:light_gray_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:light_gray_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json
new file mode 100644
index 000000000..9c5e02f19
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:lime_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:lime_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json
new file mode 100644
index 000000000..ecc5b7197
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:magenta_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:magenta_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json
new file mode 100644
index 000000000..b9a234195
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:orange_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:orange_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json
new file mode 100644
index 000000000..7f35efabf
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:pink_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:pink_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json
new file mode 100644
index 000000000..871acd659
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:purple_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:purple_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json
new file mode 100644
index 000000000..db3119371
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:red_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:red_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json
new file mode 100644
index 000000000..1e8012e2f
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:white_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:white_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json
new file mode 100644
index 000000000..a65a2a5e1
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "tag": "refinedstorage2:disk_interfaces"
+    },
+    {
+      "item": "minecraft:yellow_dye"
+    }
+  ],
+  "result": {
+    "item": "refinedstorage2:yellow_disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/disk_interfaces.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/disk_interfaces.json
new file mode 100644
index 000000000..571b84d29
--- /dev/null
+++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/disk_interfaces.json
@@ -0,0 +1,20 @@
+{
+  "values": [
+    "refinedstorage2:white_disk_interface",
+    "refinedstorage2:orange_disk_interface",
+    "refinedstorage2:magenta_disk_interface",
+    "refinedstorage2:disk_interface",
+    "refinedstorage2:yellow_disk_interface",
+    "refinedstorage2:lime_disk_interface",
+    "refinedstorage2:pink_disk_interface",
+    "refinedstorage2:gray_disk_interface",
+    "refinedstorage2:light_gray_disk_interface",
+    "refinedstorage2:cyan_disk_interface",
+    "refinedstorage2:purple_disk_interface",
+    "refinedstorage2:blue_disk_interface",
+    "refinedstorage2:brown_disk_interface",
+    "refinedstorage2:green_disk_interface",
+    "refinedstorage2:red_disk_interface",
+    "refinedstorage2:black_disk_interface"
+  ]
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java
index ad25bb221..126f06420 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java
@@ -24,6 +24,7 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveScreen;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceScreen;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageScreen;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridScreen;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockScreen;
@@ -75,6 +76,7 @@ protected static void registerScreens(final ScreenRegistration registration) {
         registration.register(Menus.INSTANCE.getFallbackSecurityCard(), FallbackSecurityCardScreen::new);
         registration.register(Menus.INSTANCE.getSecurityManager(), SecurityManagerScreen::new);
         registration.register(Menus.INSTANCE.getRelay(), RelayScreen::new);
+        registration.register(Menus.INSTANCE.getDiskInterface(), DiskInterfaceScreen::new);
     }
 
     protected static void registerAlternativeGridHints() {
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
index 3ecce5d2d..4c43d0f88 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
@@ -71,6 +71,8 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity;
@@ -146,6 +148,7 @@
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DESTRUCTOR;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DETECTOR;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_DRIVE;
+import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_INTERFACE;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.EXPORTER;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.EXTERNAL_STORAGE;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD;
@@ -338,6 +341,7 @@ protected final void registerBlocks(
         )));
         Blocks.INSTANCE.getSecurityManager().registerBlocks(callback);
         Blocks.INSTANCE.getRelay().registerBlocks(callback);
+        Blocks.INSTANCE.getDiskInterface().registerBlocks(callback);
     }
 
     protected final void registerItems(final RegistryCallback<Item> callback) {
@@ -358,6 +362,7 @@ protected final void registerItems(final RegistryCallback<Item> callback) {
         Blocks.INSTANCE.getNetworkTransmitter().registerItems(callback, Items.INSTANCE::addNetworkTransmitter);
         Blocks.INSTANCE.getSecurityManager().registerItems(callback, Items.INSTANCE::addSecurityManager);
         Blocks.INSTANCE.getRelay().registerItems(callback, Items.INSTANCE::addRelay);
+        Blocks.INSTANCE.getDiskInterface().registerItems(callback, Items.INSTANCE::addDiskInterface);
         registerStorageItems(callback);
         registerUpgrades(callback);
     }
@@ -519,6 +524,10 @@ protected final void registerUpgradeMappings() {
         PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.WIRELESS_TRANSMITTER)
             .add(Items.INSTANCE.getRangeUpgrade(), 4)
             .add(Items.INSTANCE.getCreativeRangeUpgrade());
+
+        PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DISK_INTERFACE)
+            .add(Items.INSTANCE.getSpeedUpgrade(), 4)
+            .add(Items.INSTANCE.getStackUpgrade());
     }
 
     protected final void registerBlockEntities(
@@ -657,6 +666,10 @@ protected final void registerBlockEntities(
             RELAY,
             () -> typeFactory.create(RelayBlockEntity::new, Blocks.INSTANCE.getRelay().toArray())
         ));
+        BlockEntities.INSTANCE.setDiskInterface(callback.register(
+            DISK_INTERFACE,
+            () -> typeFactory.create(DiskInterfaceBlockEntity::new, Blocks.INSTANCE.getDiskInterface().toArray())
+        ));
     }
 
     protected final void registerMenus(final RegistryCallback<MenuType<?>> callback,
@@ -756,6 +769,10 @@ protected final void registerMenus(final RegistryCallback<MenuType<?>> callback,
             RELAY,
             () -> menuTypeFactory.create(RelayContainerMenu::new)
         ));
+        Menus.INSTANCE.setDiskInterface(callback.register(
+            DISK_INTERFACE,
+            () -> menuTypeFactory.create(DiskInterfaceContainerMenu::new)
+        ));
     }
 
     protected final void registerLootFunctions(final RegistryCallback<LootItemFunctionType> callback) {
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java
index 1bdb808b2..738a7afd4 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java
@@ -26,6 +26,8 @@ public interface Config {
 
     DiskDriveEntry getDiskDrive();
 
+    DiskInterfaceEntry getDiskInterface();
+
     SimpleEnergyUsageEntry getCable();
 
     StorageBlockEntry getStorageBlock();
@@ -114,6 +116,10 @@ interface DiskDriveEntry extends SimpleEnergyUsageEntry {
         long getEnergyUsagePerDisk();
     }
 
+    interface DiskInterfaceEntry extends SimpleEnergyUsageEntry {
+        long getEnergyUsagePerDisk();
+    }
+
     interface ControllerEntry {
         long getEnergyCapacity();
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java
index ece31fd5d..cb6825030 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java
@@ -20,7 +20,7 @@ protected void init() {
         super.init();
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
+            () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
         ));
         addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE)));
         addSideButton(new ConstructorDropItemsSideButtonWidget(
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java
index cd94473b5..d57ce4d97 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java
@@ -17,6 +17,7 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockEntity;
@@ -83,6 +84,8 @@ public final class BlockEntities {
     private Supplier<BlockEntityType<SecurityManagerBlockEntity>> securityManager;
     @Nullable
     private Supplier<BlockEntityType<RelayBlockEntity>> relay;
+    @Nullable
+    private Supplier<BlockEntityType<DiskInterfaceBlockEntity>> diskInterface;
 
     private BlockEntities() {
     }
@@ -274,4 +277,12 @@ public BlockEntityType<RelayBlockEntity> getRelay() {
     public void setRelay(final Supplier<BlockEntityType<RelayBlockEntity>> supplier) {
         this.relay = supplier;
     }
+
+    public BlockEntityType<DiskInterfaceBlockEntity> getDiskInterface() {
+        return requireNonNull(diskInterface).get();
+    }
+
+    public void setDiskInterface(final Supplier<BlockEntityType<DiskInterfaceBlockEntity>> supplier) {
+        this.diskInterface = supplier;
+    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java
index c4814773d..1324c2e24 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java
@@ -22,6 +22,7 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlock;
@@ -151,6 +152,12 @@ public final class Blocks {
         ContentNames.RELAY,
         COLOR
     );
+    private final BlockColorMap<DiskInterfaceBlock, BaseBlockItem> diskInterface = new BlockColorMap<>(
+        DiskInterfaceBlock::new,
+        ContentIds.DISK_INTERFACE,
+        ContentNames.DISK_INTERFACE,
+        COLOR
+    );
 
     @Nullable
     private Supplier<SimpleBlock> quartzEnrichedIronBlock;
@@ -312,4 +319,8 @@ public BlockColorMap<SecurityManagerBlock, BaseBlockItem> getSecurityManager() {
     public BlockColorMap<RelayBlock, BaseBlockItem> getRelay() {
         return relay;
     }
+
+    public BlockColorMap<DiskInterfaceBlock, BaseBlockItem> getDiskInterface() {
+        return diskInterface;
+    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java
index 5d61fa250..e8b55f15f 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java
@@ -58,6 +58,7 @@ public final class ContentIds {
     public static final ResourceLocation FALLBACK_SECURITY_CARD = createIdentifier("fallback_security_card");
     public static final ResourceLocation SECURITY_MANAGER = createIdentifier("security_manager");
     public static final ResourceLocation RELAY = createIdentifier("relay");
+    public static final ResourceLocation DISK_INTERFACE = createIdentifier("disk_interface");
 
     private ContentIds() {
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java
index 6ce442caf..811af7e5b 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java
@@ -33,6 +33,7 @@ public final class ContentNames {
     public static final MutableComponent FALLBACK_SECURITY_CARD = createTranslation("item", "fallback_security_card");
     public static final MutableComponent SECURITY_MANAGER = name("security_manager");
     public static final MutableComponent RELAY = name("relay");
+    public static final MutableComponent DISK_INTERFACE = name("disk_interface");
 
     private ContentNames() {
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java
index f79f0546b..97c2159a3 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java
@@ -55,6 +55,7 @@ private static void appendBlocks(final Consumer<ItemStack> consumer) {
         Items.INSTANCE.getNetworkReceivers().stream().map(Supplier::get).forEach(itemConsumer);
         Items.INSTANCE.getSecurityManagers().stream().map(Supplier::get).forEach(itemConsumer);
         Items.INSTANCE.getRelays().stream().map(Supplier::get).forEach(itemConsumer);
+        Items.INSTANCE.getDiskInterfaces().stream().map(Supplier::get).forEach(itemConsumer);
     }
 
     private static void appendBlockColors(final Consumer<ItemStack> consumer, final BlockColorMap<?, ?> map) {
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java
index cad36d18a..1e0b6c8a1 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java
@@ -10,9 +10,11 @@ public final class DefaultEnergyUsage {
     public static final long GRID = 10;
     public static final long CRAFTING_GRID = 14;
     public static final long DISK_DRIVE = 10;
+    public static final long DISK_DRIVE_PER_DISK = 4;
+    public static final long DISK_INTERFACE = 6;
+    public static final long DISK_INTERFACE_PER_DISK = 4;
     public static final long CONSTRUCTOR = 3;
     public static final long DESTRUCTOR = 3;
-    public static final long DISK_DRIVE_PER_DISK = 4;
     public static final long STORAGE_MONITOR = 4;
     public static final long NETWORK_RECEIVER = 8;
     public static final long NETWORK_TRANSMITTER = 32;
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java
index 07036ed8d..ace5950df 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java
@@ -49,6 +49,7 @@ public final class Items {
     private final List<Supplier<BaseBlockItem>> allNetworkTransmitters = new ArrayList<>();
     private final List<Supplier<BaseBlockItem>> allSecurityManagers = new ArrayList<>();
     private final List<Supplier<BaseBlockItem>> allRelays = new ArrayList<>();
+    private final List<Supplier<BaseBlockItem>> allDiskInterfaces = new ArrayList<>();
     @Nullable
     private Supplier<Item> quartzEnrichedIron;
     @Nullable
@@ -416,6 +417,14 @@ public List<Supplier<BaseBlockItem>> getRelays() {
         return Collections.unmodifiableList(allRelays);
     }
 
+    public void addDiskInterface(final Supplier<BaseBlockItem> supplier) {
+        allDiskInterfaces.add(supplier);
+    }
+
+    public List<Supplier<BaseBlockItem>> getDiskInterfaces() {
+        return Collections.unmodifiableList(allDiskInterfaces);
+    }
+
     public Item getNetworkCard() {
         return requireNonNull(networkCard).get();
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java
index 21c477e97..4faa928f5 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java
@@ -16,6 +16,7 @@
 import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridItemContainerMenu;
@@ -83,6 +84,8 @@ public final class Menus {
     private Supplier<MenuType<SecurityManagerContainerMenu>> securityManager;
     @Nullable
     private Supplier<MenuType<RelayContainerMenu>> relay;
+    @Nullable
+    private Supplier<MenuType<DiskInterfaceContainerMenu>> diskInterface;
 
     private Menus() {
     }
@@ -280,4 +283,12 @@ public MenuType<RelayContainerMenu> getRelay() {
     public void setRelay(final Supplier<MenuType<RelayContainerMenu>> relay) {
         this.relay = relay;
     }
+
+    public MenuType<DiskInterfaceContainerMenu> getDiskInterface() {
+        return requireNonNull(diskInterface).get();
+    }
+
+    public void setDiskInterface(final Supplier<MenuType<DiskInterfaceContainerMenu>> diskInterface) {
+        this.diskInterface = diskInterface;
+    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java
index 068fdd0de..4c8dd0fd6 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java
@@ -25,6 +25,7 @@ public final class Tags {
     public static final TagKey<Item> NETWORK_TRANSMITTERS = createTag("network_transmitters");
     public static final TagKey<Item> SECURITY_MANAGERS = createTag("security_managers");
     public static final TagKey<Item> RELAYS = createTag("relays");
+    public static final TagKey<Item> DISK_INTERFACES = createTag("disk_interfaces");
 
     private Tags() {
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java
index b58ac5c46..3b049ecac 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java
@@ -17,7 +17,7 @@ protected void init() {
         super.init();
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.GENERIC
+            () -> FuzzyModeSideButtonWidget.Type.GENERIC
         ));
         addSideButton(new DetectorModeSideButtonWidget(getMenu().getProperty(DetectorPropertyTypes.MODE)));
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java
index 16bd5ea65..d3edd6243 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java
@@ -18,7 +18,7 @@ protected void init() {
         super.init();
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
+            () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
         ));
         addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE)));
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java
index fcba67225..f9519a55d 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java
@@ -29,7 +29,7 @@ protected void init() {
         addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE)));
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
+            () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
         ));
     }
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java
index 442e12938..d7244864f 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java
@@ -25,7 +25,7 @@ protected void init() {
         ));
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE
+            () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE
         ));
     }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java
index 60349cac6..c623642b3 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java
@@ -1,19 +1,18 @@
 package com.refinedmods.refinedstorage2.platform.common.networking;
 
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
+
 import java.util.Optional;
 
 import net.minecraft.core.GlobalPos;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.item.ItemStack;
 
-class NetworkCardInventory extends SimpleContainer {
+class NetworkCardInventory extends FilteredContainer {
     NetworkCardInventory() {
-        super(1);
-    }
-
-    @Override
-    public boolean canPlaceItem(final int slot, final ItemStack stack) {
-        return stack.getItem() instanceof NetworkCardItem networkCardItem && networkCardItem.isActive(stack);
+        super(
+            1,
+            stack -> stack.getItem() instanceof NetworkCardItem networkCardItem && networkCardItem.isActive(stack)
+        );
     }
 
     ItemStack getNetworkCard() {
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java
index b54b36db8..c2595e952 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java
@@ -17,6 +17,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.Level;
@@ -29,10 +30,13 @@
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
+
 public class RelayBlock extends AbstractDirectionalBlock<Direction>
     implements EntityBlock, ColorableBlock<RelayBlock, BaseBlockItem>, BlockItemProvider<BaseBlockItem> {
     public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
 
+    private static final Component HELP = createTranslation("item", "relay.help");
     private static final AbstractBlockEntityTicker<RelayBlockEntity> TICKER = new NetworkNodeBlockEntityTicker<>(
         BlockEntities.INSTANCE::getRelay,
         ACTIVE
@@ -79,7 +83,7 @@ protected DirectionType<Direction> getDirectionType() {
 
     @Override
     public BaseBlockItem createBlockItem() {
-        return new BaseBlockItem(this);
+        return new BaseBlockItem(this, HELP);
     }
 
     @Override
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java
index 0192726f9..9b369e8a1 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java
@@ -94,7 +94,7 @@ private void addStorageButtons(final boolean visible) {
 
         fuzzyModeButton = new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.STORAGE
+            () -> FuzzyModeSideButtonWidget.Type.STORAGE
         );
         fuzzyModeButton.visible = visible;
         addSideButton(fuzzyModeButton);
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java
index a49fb40f3..4895abeac 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java
@@ -4,11 +4,10 @@
 import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
+import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
-import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.HorizontalDirection;
@@ -21,43 +20,23 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
 
-public class SecurityManagerBlock extends AbstractDirectionalBlock<HorizontalDirection>
-    implements ColorableBlock<SecurityManagerBlock, BaseBlockItem>, BlockItemProvider<BaseBlockItem>, EntityBlock {
-    public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
-
+public class SecurityManagerBlock
+    extends AbstractActiveColoredDirectionalBlock<HorizontalDirection, SecurityManagerBlock, BaseBlockItem>
+    implements BlockItemProvider<BaseBlockItem>, EntityBlock {
     private static final MutableComponent HELP = createTranslation("block", "security_manager.help");
     private static final AbstractBlockEntityTicker<SecurityManagerBlockEntity> TICKER =
         new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getSecurityManager, ACTIVE);
 
-    private final DyeColor color;
-    private final MutableComponent name;
-
     public SecurityManagerBlock(final DyeColor color, final MutableComponent name) {
-        super(BlockConstants.PROPERTIES);
-        this.color = color;
-        this.name = name;
-    }
-
-    @Override
-    protected BlockState getDefaultState() {
-        return super.getDefaultState().setValue(ACTIVE, false);
-    }
-
-    @Override
-    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> builder) {
-        super.createBlockStateDefinition(builder);
-        builder.add(ACTIVE);
+        super(BlockConstants.PROPERTIES, color, name);
     }
 
     @Override
@@ -70,16 +49,6 @@ public BlockColorMap<SecurityManagerBlock, BaseBlockItem> getBlockColorMap() {
         return Blocks.INSTANCE.getSecurityManager();
     }
 
-    @Override
-    public DyeColor getColor() {
-        return color;
-    }
-
-    @Override
-    public MutableComponent getName() {
-        return name;
-    }
-
     @Override
     public BaseBlockItem createBlockItem() {
         return new NetworkNodeBlockItem(this, HELP);
@@ -98,9 +67,4 @@ public <O extends BlockEntity> BlockEntityTicker<O> getTicker(final Level level,
                                                                   final BlockEntityType<O> type) {
         return TICKER.get(level, type);
     }
-
-    @Override
-    public boolean canAlwaysConnect() {
-        return true;
-    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java
index cceb99850..a4c9b5a1e 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java
@@ -9,7 +9,7 @@
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops;
-import com.refinedmods.refinedstorage2.platform.common.support.SimpleFilteredContainer;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil;
@@ -23,7 +23,6 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -38,11 +37,11 @@ public class SecurityManagerBlockEntity
     private static final String TAG_SECURITY_CARDS = "sc";
     private static final String TAG_FALLBACK_SECURITY_CARD = "fsc";
 
-    private final SimpleContainer securityCards = new SimpleFilteredContainer(
+    private final FilteredContainer securityCards = new FilteredContainer(
         CARD_AMOUNT,
         SecurityManagerBlockEntity::isValidSecurityCard
     );
-    private final SimpleContainer fallbackSecurityCard = new SimpleFilteredContainer(
+    private final FilteredContainer fallbackSecurityCard = new FilteredContainer(
         1,
         SecurityManagerBlockEntity::isValidFallbackSecurityCard
     );
@@ -124,11 +123,11 @@ public NonNullList<ItemStack> getDrops() {
         return drops;
     }
 
-    SimpleContainer getSecurityCards() {
+    FilteredContainer getSecurityCards() {
         return securityCards;
     }
 
-    SimpleContainer getFallbackSecurityCard() {
+    FilteredContainer getFallbackSecurityCard() {
         return fallbackSecurityCard;
     }
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java
index 78ece2d4e..6dc7a36c4 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java
@@ -2,8 +2,8 @@
 
 import com.refinedmods.refinedstorage2.platform.common.content.Menus;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
 import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode;
-import com.refinedmods.refinedstorage2.platform.common.support.SimpleFilteredContainer;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty;
@@ -11,7 +11,6 @@
 
 import javax.annotation.Nullable;
 
-import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.Slot;
 
@@ -25,8 +24,8 @@ public SecurityManagerContainerMenu(final int syncId, final Inventory playerInve
         super(Menus.INSTANCE.getSecurityManager(), syncId);
         addSlots(
             playerInventory,
-            new SimpleFilteredContainer(CARD_AMOUNT, SecurityManagerBlockEntity::isValidSecurityCard),
-            new SimpleFilteredContainer(1, SecurityManagerBlockEntity::isValidFallbackSecurityCard)
+            new FilteredContainer(CARD_AMOUNT, SecurityManagerBlockEntity::isValidSecurityCard),
+            new FilteredContainer(1, SecurityManagerBlockEntity::isValidFallbackSecurityCard)
         );
         registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE));
     }
@@ -44,8 +43,8 @@ public SecurityManagerContainerMenu(final int syncId, final Inventory playerInve
     }
 
     private void addSlots(final Inventory playerInventory,
-                          final Container securityCards,
-                          final Container fallbackSecurityCard) {
+                          final FilteredContainer securityCards,
+                          final FilteredContainer fallbackSecurityCard) {
         for (int i = 0; i < CARD_AMOUNT; ++i) {
             final int column = i % 9;
             final int x = 8 + (column * 18);
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java
new file mode 100644
index 000000000..5f39ab293
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java
@@ -0,0 +1,215 @@
+package com.refinedmods.refinedstorage2.platform.common.storage;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode;
+import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock;
+import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops;
+import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl;
+import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil;
+
+import java.util.Set;
+import java.util.function.UnaryOperator;
+import javax.annotation.Nullable;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.NonNullList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+public abstract class AbstractDiskContainerBlockEntity<T extends AbstractStorageContainerNetworkNode>
+    extends AbstractRedstoneModeNetworkNodeContainerBlockEntity<T>
+    implements BlockEntityWithDrops, NetworkNodeMenuProvider {
+    private static final String TAG_DISK_INVENTORY = "inv";
+    private static final String TAG_DISKS = "disks";
+
+    protected final FilterWithFuzzyMode filter;
+    protected final DiskInventory diskInventory;
+    @Nullable
+    protected Disk[] disks;
+
+    private final DiskStateChangeListener diskStateListener = new DiskStateChangeListener(this);
+
+    protected AbstractDiskContainerBlockEntity(final BlockEntityType<?> type,
+                                               final BlockPos pos,
+                                               final BlockState state,
+                                               final T node) {
+        super(type, pos, state, node);
+        this.diskInventory = new DiskInventory((inventory, slot) -> onDiskChanged(slot), mainNode.getSize());
+        this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters(
+            ResourceContainerImpl.createForFilter(),
+            this::setChanged,
+            this::setFilters
+        );
+        this.mainNode.setListener(diskStateListener);
+        setNormalizer(filter.createNormalizer());
+        // It's important to sync here as the initial update packet might have failed as the network
+        // could possibly be not initialized yet.
+        this.initializationCallback = diskStateListener::immediateUpdate;
+    }
+
+    protected abstract void setFilters(Set<ResourceKey> filters);
+
+    protected abstract void setNormalizer(UnaryOperator<ResourceKey> normalizer);
+
+    @Nullable
+    public static Item getDisk(final CompoundTag tag, final int slot) {
+        if (!tag.contains(TAG_DISK_INVENTORY)) {
+            return null;
+        }
+        final CompoundTag diskInventoryTag = tag.getCompound(TAG_DISK_INVENTORY);
+        if (!ContainerUtil.hasItemInSlot(diskInventoryTag, slot)) {
+            return null;
+        }
+        final ItemStack diskStack = ContainerUtil.getItemInSlot(diskInventoryTag, slot);
+        return diskStack.isEmpty() ? null : diskStack.getItem();
+    }
+
+    void updateDiskStateIfNecessaryInLevel() {
+        diskStateListener.updateIfNecessary();
+    }
+
+    @Override
+    public void setLevel(final Level level) {
+        super.setLevel(level);
+        if (!level.isClientSide()) {
+            initialize(level);
+        }
+    }
+
+    /**
+     * When loading a disk drive in a normal flow it is: #load(CompoundTag) -> #setLevel(Level).
+     * Network initialization happens in #setLevel(Level).
+     * Loading data before network initialization ensures that all nbt is present (and thus disks are available).
+     * However, when we place a block entity with nbt, the flow is different:
+     * #setLevel(Level) -> #load(CompoundTag) -> #setChanged().
+     * #setLevel(Level) is called first (before #load(CompoundTag)) and initialization will happen BEFORE
+     * we load the tag!
+     * That's why we need to override #setChanged() here, to ensure that the network and disks are still initialized
+     * correctly in that case.
+     */
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (level != null && !level.isClientSide()) {
+            initialize(level);
+        }
+    }
+
+    private void initialize(final Level level) {
+        diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level));
+        mainNode.setProvider(diskInventory);
+    }
+
+    @Override
+    public void activenessChanged(final boolean newActive) {
+        super.activenessChanged(newActive);
+        diskStateListener.immediateUpdate();
+    }
+
+    @Override
+    public void load(final CompoundTag tag) {
+        fromClientTag(tag);
+        if (tag.contains(TAG_DISK_INVENTORY)) {
+            ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory);
+        }
+        super.load(tag);
+    }
+
+    @Override
+    public void readConfiguration(final CompoundTag tag) {
+        super.readConfiguration(tag);
+        filter.load(tag);
+    }
+
+    @Override
+    public void saveAdditional(final CompoundTag tag) {
+        super.saveAdditional(tag);
+        tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory));
+    }
+
+    @Override
+    public void writeConfiguration(final CompoundTag tag) {
+        super.writeConfiguration(tag);
+        filter.save(tag);
+    }
+
+    public FilteredContainer getDiskInventory() {
+        return diskInventory;
+    }
+
+    private void onDiskChanged(final int slot) {
+        // Level will not yet be present
+        final boolean isJustPlacedIntoLevelOrLoading = level == null || level.isClientSide();
+        // Level will be present, but network not yet
+        final boolean isPlacedThroughDismantlingMode = mainNode.getNetwork() == null;
+        if (isJustPlacedIntoLevelOrLoading || isPlacedThroughDismantlingMode) {
+            return;
+        }
+        mainNode.onStorageChanged(slot);
+        diskStateListener.immediateUpdate();
+        setChanged();
+    }
+
+    private void fromClientTag(final CompoundTag tag) {
+        if (!tag.contains(TAG_DISKS)) {
+            return;
+        }
+        disks = diskInventory.fromSyncTag(tag.getList(TAG_DISKS, Tag.TAG_COMPOUND));
+        onClientDriveStateUpdated();
+    }
+
+    protected void onClientDriveStateUpdated() {
+        diskStateListener.immediateUpdate();
+    }
+
+    @Override
+    public Packet<ClientGamePacketListener> getUpdatePacket() {
+        return ClientboundBlockEntityDataPacket.create(this);
+    }
+
+    @Override
+    public CompoundTag getUpdateTag() {
+        final CompoundTag tag = new CompoundTag();
+        // This null check is important. #getUpdateTag() can be called before the node's network is initialized!
+        if (mainNode.getNetwork() == null) {
+            return tag;
+        }
+        tag.put(TAG_DISKS, diskInventory.toSyncTag(mainNode::getState));
+        return tag;
+    }
+
+    @Override
+    public NonNullList<ItemStack> getDrops() {
+        final NonNullList<ItemStack> drops = NonNullList.create();
+        for (int i = 0; i < diskInventory.getContainerSize(); ++i) {
+            drops.add(diskInventory.getItem(i));
+        }
+        return drops;
+    }
+
+    @Override
+    public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) {
+        filter.getFilterContainer().writeToUpdatePacket(buf);
+    }
+
+    @Override
+    protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState oldBlockState,
+                                                                   final BlockState newBlockState) {
+        return AbstractDirectionalBlock.doesBlockStateChangeWarrantNetworkNodeUpdate(oldBlockState, newBlockState);
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java
index ee88a303e..5c8d5c29c 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java
@@ -44,7 +44,7 @@ protected void init() {
         addSideButton(filterModeSideButtonWidget);
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.STORAGE
+            () -> FuzzyModeSideButtonWidget.Type.STORAGE
         ));
         addSideButton(new AccessModeSideButtonWidget(getMenu().getProperty(StoragePropertyTypes.ACCESS_MODE)));
         addSideButton(new PrioritySideButtonWidget(
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java
new file mode 100644
index 000000000..bd72bbf22
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java
@@ -0,0 +1,38 @@
+package com.refinedmods.refinedstorage2.platform.common.storage;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
+
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+
+public class DiskContainerBlockEntityTicker
+    <T extends AbstractStorageContainerNetworkNode, B extends AbstractDiskContainerBlockEntity<T>>
+    extends NetworkNodeBlockEntityTicker<T, B> {
+
+    public DiskContainerBlockEntityTicker(
+        final Supplier<BlockEntityType<B>> allowedTypeSupplier
+    ) {
+        super(allowedTypeSupplier);
+    }
+
+    public DiskContainerBlockEntityTicker(final Supplier<BlockEntityType<B>> allowedTypeSupplier,
+                                          @Nullable final BooleanProperty activenessProperty) {
+        super(allowedTypeSupplier, activenessProperty);
+    }
+
+    @Override
+    public void tick(final Level level,
+                     final BlockPos pos,
+                     final BlockState state,
+                     final B blockEntity) {
+        super.tick(level, pos, state, blockEntity);
+        blockEntity.updateDiskStateIfNecessaryInLevel();
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java
index d5a8871bc..3345e5bad 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java
@@ -5,6 +5,7 @@
 import com.refinedmods.refinedstorage2.api.storage.StorageState;
 import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem;
 import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
 
 import java.util.Optional;
 import java.util.function.IntFunction;
@@ -13,10 +14,9 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.item.ItemStack;
 
-public class DiskInventory extends SimpleContainer implements AbstractStorageContainerNetworkNode.Provider {
+public class DiskInventory extends FilteredContainer implements AbstractStorageContainerNetworkNode.Provider {
     private static final String TAG_DISK_STATE = "s";
     private static final String TAG_DISK_ITEM_ID = "i";
 
@@ -25,7 +25,7 @@ public class DiskInventory extends SimpleContainer implements AbstractStorageCon
     private StorageRepository storageRepository;
 
     public DiskInventory(final DiskListener listener, final int diskCount) {
-        super(diskCount);
+        super(diskCount, StorageContainerItem.stackValidator());
         this.listener = listener;
     }
 
@@ -33,11 +33,6 @@ public void setStorageRepository(@Nullable final StorageRepository storageReposi
         this.storageRepository = storageRepository;
     }
 
-    @Override
-    public boolean canPlaceItem(final int slot, final ItemStack stack) {
-        return stack.getItem() instanceof StorageContainerItem;
-    }
-
     @Override
     public ItemStack removeItem(final int slot, final int amount) {
         // Forge InvWrapper calls this instead of setItem.
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java
index ddfff6b69..ad384439b 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java
@@ -117,6 +117,11 @@ public boolean isAllowed(final ResourceKey resource) {
         return resource instanceof FluidResource;
     }
 
+    @Override
+    public long getDiskInterfaceTransferQuota(final boolean stackUpgrade) {
+        return stackUpgrade ? Platform.INSTANCE.getBucketAmount() * 16 : Platform.INSTANCE.getBucketAmount();
+    }
+
     public enum Variant {
         SIXTY_FOUR_B("64b", 64L),
         TWO_HUNDRED_FIFTY_SIX_B("256b", 256L),
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java
index 8f9d78c15..7f8893887 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java
@@ -116,6 +116,11 @@ public boolean isAllowed(final ResourceKey resource) {
         return resource instanceof ItemResource;
     }
 
+    @Override
+    public long getDiskInterfaceTransferQuota(final boolean stackUpgrade) {
+        return stackUpgrade ? 64 : 1;
+    }
+
     public enum Variant {
         ONE_K("1k", 1024L),
         FOUR_K("4k", 1024 * 4L),
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java
index b8189de59..d46b02d2d 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java
@@ -1,58 +1,28 @@
 package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive;
 
 import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode;
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
-import com.refinedmods.refinedstorage2.platform.common.storage.Disk;
-import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory;
-import com.refinedmods.refinedstorage2.platform.common.storage.DiskStateChangeListener;
+import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock;
-import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops;
-import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode;
-import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider;
-import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl;
-import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil;
 
-import javax.annotation.Nullable;
+import java.util.Set;
+import java.util.function.UnaryOperator;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 
-public abstract class AbstractDiskDriveBlockEntity
-    extends AbstractRedstoneModeNetworkNodeContainerBlockEntity<StorageNetworkNode>
-    implements BlockEntityWithDrops, NetworkNodeMenuProvider {
-    public static final int AMOUNT_OF_DISKS = 8;
+public abstract class AbstractDiskDriveBlockEntity extends AbstractDiskContainerBlockEntity<StorageNetworkNode> {
+    static final int AMOUNT_OF_DISKS = 8;
 
-    private static final String TAG_DISK_INVENTORY = "inv";
-    private static final String TAG_DISKS = "disks";
-
-    @Nullable
-    protected Disk[] disks;
-
-    private final DiskInventory diskInventory;
-    private final FilterWithFuzzyMode filter;
     private final StorageConfigurationContainerImpl configContainer;
-    private final DiskStateChangeListener diskStateListener = new DiskStateChangeListener(this);
 
     protected AbstractDiskDriveBlockEntity(final BlockPos pos, final BlockState state) {
         super(BlockEntities.INSTANCE.getDiskDrive(), pos, state, new StorageNetworkNode(
@@ -60,153 +30,35 @@ protected AbstractDiskDriveBlockEntity(final BlockPos pos, final BlockState stat
             Platform.INSTANCE.getConfig().getDiskDrive().getEnergyUsagePerDisk(),
             AMOUNT_OF_DISKS
         ));
-        this.diskInventory = new DiskInventory((inventory, slot) -> onDiskChanged(slot), mainNode.getSize());
-        this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters(
-            ResourceContainerImpl.createForFilter(),
-            this::setChanged,
-            mainNode::setFilters
-        );
         this.configContainer = new StorageConfigurationContainerImpl(
-            mainNode,
+            mainNode.getStorageConfiguration(),
             filter,
             this::setChanged,
             this::getRedstoneMode,
             this::setRedstoneMode
         );
-        this.mainNode.setListener(diskStateListener);
-        this.mainNode.setNormalizer(filter.createNormalizer());
-        // It's important to sync here as the initial update packet might have failed as the network
-        // could possibly be not initialized yet.
-        this.initializationCallback = diskStateListener::immediateUpdate;
-    }
-
-    @Nullable
-    public static Item getDisk(final CompoundTag tag, final int slot) {
-        if (!tag.contains(TAG_DISK_INVENTORY)) {
-            return null;
-        }
-        final CompoundTag diskInventoryTag = tag.getCompound(TAG_DISK_INVENTORY);
-        if (!ContainerUtil.hasItemInSlot(diskInventoryTag, slot)) {
-            return null;
-        }
-        final ItemStack diskStack = ContainerUtil.getItemInSlot(diskInventoryTag, slot);
-        return diskStack.isEmpty() ? null : diskStack.getItem();
-    }
-
-    void updateDiskStateIfNecessaryInLevel() {
-        diskStateListener.updateIfNecessary();
     }
 
     @Override
-    public void setLevel(final Level level) {
-        super.setLevel(level);
-        if (!level.isClientSide()) {
-            initialize(level);
-        }
+    protected void setFilters(final Set<ResourceKey> filters) {
+        mainNode.getStorageConfiguration().setFilters(filters);
     }
 
-    /**
-     * When loading a disk drive in a normal flow it is: #load(CompoundTag) -> #setLevel(Level).
-     * Network initialization happens in #setLevel(Level).
-     * Loading data before network initialization ensures that all nbt is present (and thus disks are available).
-     * However, when we place a block entity with nbt, the flow is different:
-     * #setLevel(Level) -> #load(CompoundTag) -> #setChanged().
-     * #setLevel(Level) is called first (before #load(CompoundTag)) and initialization will happen BEFORE
-     * we load the tag!
-     * That's why we need to override #setChanged() here, to ensure that the network and disks are still initialized
-     * correctly in that case.
-     */
     @Override
-    public void setChanged() {
-        super.setChanged();
-        if (level != null && !level.isClientSide()) {
-            initialize(level);
-        }
-    }
-
-    private void initialize(final Level level) {
-        diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level));
-        mainNode.setProvider(diskInventory);
-    }
-
-    @Override
-    public void activenessChanged(final boolean newActive) {
-        super.activenessChanged(newActive);
-        diskStateListener.immediateUpdate();
-    }
-
-    @Override
-    public void load(final CompoundTag tag) {
-        fromClientTag(tag);
-        if (tag.contains(TAG_DISK_INVENTORY)) {
-            ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory);
-        }
-        super.load(tag);
+    protected void setNormalizer(final UnaryOperator<ResourceKey> normalizer) {
+        mainNode.getStorageConfiguration().setNormalizer(normalizer);
     }
 
     @Override
     public void readConfiguration(final CompoundTag tag) {
         super.readConfiguration(tag);
         configContainer.load(tag);
-        filter.load(tag);
-    }
-
-    @Override
-    public void saveAdditional(final CompoundTag tag) {
-        super.saveAdditional(tag);
-        tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory));
     }
 
     @Override
     public void writeConfiguration(final CompoundTag tag) {
         super.writeConfiguration(tag);
         configContainer.save(tag);
-        filter.save(tag);
-    }
-
-    public SimpleContainer getDiskInventory() {
-        return diskInventory;
-    }
-
-    private void onDiskChanged(final int slot) {
-        // Level will not yet be present
-        final boolean isJustPlacedIntoLevelOrLoading = level == null || level.isClientSide();
-        // Level will be present, but network not yet
-        final boolean isPlacedThroughDismantlingMode = mainNode.getNetwork() == null;
-        if (isJustPlacedIntoLevelOrLoading || isPlacedThroughDismantlingMode) {
-            return;
-        }
-        mainNode.onStorageChanged(slot);
-        diskStateListener.immediateUpdate();
-        setChanged();
-    }
-
-    private void fromClientTag(final CompoundTag tag) {
-        if (!tag.contains(TAG_DISKS)) {
-            return;
-        }
-        disks = diskInventory.fromSyncTag(tag.getList(TAG_DISKS, Tag.TAG_COMPOUND));
-        onClientDriveStateUpdated();
-    }
-
-    protected void onClientDriveStateUpdated() {
-        diskStateListener.immediateUpdate();
-    }
-
-    @Override
-    public Packet<ClientGamePacketListener> getUpdatePacket() {
-        return ClientboundBlockEntityDataPacket.create(this);
-    }
-
-    @Override
-    public CompoundTag getUpdateTag() {
-        final CompoundTag tag = new CompoundTag();
-        // This null check is important. #getUpdateTag() can be called before the node's network is initialized!
-        if (mainNode.getNetwork() == null) {
-            return tag;
-        }
-        tag.put(TAG_DISKS, diskInventory.toSyncTag(mainNode::getState));
-        return tag;
     }
 
     @Override
@@ -225,24 +77,4 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory inv, f
             new EmptyStorageDiskInfoAccessor()
         );
     }
-
-    @Override
-    public NonNullList<ItemStack> getDrops() {
-        final NonNullList<ItemStack> drops = NonNullList.create();
-        for (int i = 0; i < diskInventory.getContainerSize(); ++i) {
-            drops.add(diskInventory.getItem(i));
-        }
-        return drops;
-    }
-
-    @Override
-    public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) {
-        filter.getFilterContainer().writeToUpdatePacket(buf);
-    }
-
-    @Override
-    protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState oldBlockState,
-                                                                   final BlockState newBlockState) {
-        return AbstractDirectionalBlock.doesBlockStateChangeWarrantNetworkNodeUpdate(oldBlockState, newBlockState);
-    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java
index fa5752604..2a52594ac 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java
@@ -1,6 +1,9 @@
 package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive;
 
+import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants;
+import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
+import com.refinedmods.refinedstorage2.platform.common.storage.DiskContainerBlockEntityTicker;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection;
@@ -23,7 +26,8 @@
 
 public class DiskDriveBlock extends AbstractDirectionalBlock<BiDirection> implements EntityBlock {
     private static final Component HELP = createTranslation("item", "disk_drive.help");
-    private static final DiskDriveBlockEntityTicker TICKER = new DiskDriveBlockEntityTicker();
+    private static final DiskContainerBlockEntityTicker<StorageNetworkNode, AbstractDiskDriveBlockEntity> TICKER =
+        new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskDrive);
 
     private final BiFunction<BlockPos, BlockState, AbstractDiskDriveBlockEntity> blockEntityFactory;
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlockEntityTicker.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlockEntityTicker.java
deleted file mode 100644
index ea731571e..000000000
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlockEntityTicker.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive;
-
-import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode;
-import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
-import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
-
-class DiskDriveBlockEntityTicker
-    extends NetworkNodeBlockEntityTicker<StorageNetworkNode, AbstractDiskDriveBlockEntity> {
-
-    DiskDriveBlockEntityTicker() {
-        super(BlockEntities.INSTANCE::getDiskDrive);
-    }
-
-    @Override
-    public void tick(final Level level,
-                     final BlockPos pos,
-                     final BlockState state,
-                     final AbstractDiskDriveBlockEntity blockEntity) {
-        super.tick(level, pos, state, blockEntity);
-        blockEntity.updateDiskStateIfNecessaryInLevel();
-    }
-}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java
index 1e9faa0b7..de2ae7155 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java
@@ -8,6 +8,7 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.AbstractStorageContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.StorageAccessor;
 import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot;
@@ -19,7 +20,6 @@
 import java.util.stream.Stream;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
@@ -45,7 +45,10 @@ public DiskDriveContainerMenu(final int syncId, final Inventory playerInventory,
         ));
         addSlots(
             playerInventory.player,
-            new SimpleContainer(AbstractDiskDriveBlockEntity.AMOUNT_OF_DISKS),
+            new FilteredContainer(
+                AbstractDiskDriveBlockEntity.AMOUNT_OF_DISKS,
+                StorageContainerItem.stackValidator()
+            ),
             ResourceContainerImpl.createForFilter()
         );
         initializeResourceSlots(buf);
@@ -53,23 +56,23 @@ public DiskDriveContainerMenu(final int syncId, final Inventory playerInventory,
 
     DiskDriveContainerMenu(final int syncId,
                            final Player player,
-                           final SimpleContainer diskInventory,
-                           final ResourceContainer resourceContainer,
+                           final FilteredContainer diskInventory,
+                           final ResourceContainer filterContainer,
                            final StorageConfigurationContainer configContainer,
                            final StorageDiskInfoAccessor storageInfoAccessor) {
         super(Menus.INSTANCE.getDiskDrive(), syncId, player, configContainer);
         this.storageInfoAccessor = storageInfoAccessor;
-        addSlots(player, diskInventory, resourceContainer);
+        addSlots(player, diskInventory, filterContainer);
     }
 
     private void addSlots(final Player player,
-                          final SimpleContainer diskInventory,
-                          final ResourceContainer resourceContainer) {
+                          final FilteredContainer diskInventory,
+                          final ResourceContainer filterContainer) {
         for (int i = 0; i < diskInventory.getContainerSize(); ++i) {
             diskSlots.add(addSlot(createDiskSlot(diskInventory, i)));
         }
-        for (int i = 0; i < resourceContainer.size(); ++i) {
-            addSlot(createFilterSlot(resourceContainer, i));
+        for (int i = 0; i < filterContainer.size(); ++i) {
+            addSlot(createFilterSlot(filterContainer, i));
         }
         addPlayerInventory(player.getInventory(), 8, 141);
 
@@ -77,10 +80,10 @@ private void addSlots(final Player player,
         transferManager.addFilterTransfer(player.getInventory());
     }
 
-    private Slot createFilterSlot(final ResourceContainer resourceContainer, final int i) {
+    private Slot createFilterSlot(final ResourceContainer filterContainer, final int i) {
         final int x = FILTER_SLOT_X + (18 * i);
         return new ResourceSlot(
-            resourceContainer,
+            filterContainer,
             i,
             createTranslation("gui", "storage.filter_help"),
             x,
@@ -89,10 +92,10 @@ private Slot createFilterSlot(final ResourceContainer resourceContainer, final i
         );
     }
 
-    private Slot createDiskSlot(final SimpleContainer diskInventory, final int i) {
+    private Slot createDiskSlot(final FilteredContainer diskInventory, final int i) {
         final int x = DISK_SLOT_X + ((i % 2) * 18);
         final int y = DISK_SLOT_Y + Math.floorDiv(i, 2) * 18;
-        return new ValidatedSlot(diskInventory, i, x, y, stack -> stack.getItem() instanceof StorageContainerItem);
+        return ValidatedSlot.forStorageContainer(diskInventory, i, x, y);
     }
 
     @Override
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java
new file mode 100644
index 000000000..7f84f5a27
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java
@@ -0,0 +1,71 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode;
+import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap;
+import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants;
+import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
+import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
+import com.refinedmods.refinedstorage2.platform.common.storage.DiskContainerBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock;
+import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem;
+import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem;
+import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection;
+import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType;
+import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
+
+public class DiskInterfaceBlock
+    extends AbstractActiveColoredDirectionalBlock<BiDirection, DiskInterfaceBlock, BaseBlockItem>
+    implements EntityBlock, BlockItemProvider<BaseBlockItem> {
+    private static final Component HELP = createTranslation("item", "disk_interface.help");
+    private static final DiskContainerBlockEntityTicker<StorageTransferNetworkNode, DiskInterfaceBlockEntity> TICKER =
+        new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskInterface, ACTIVE);
+
+    public DiskInterfaceBlock(final DyeColor color, final MutableComponent name) {
+        super(BlockConstants.PROPERTIES, color, name);
+    }
+
+    @Override
+    protected DirectionType<BiDirection> getDirectionType() {
+        return BiDirectionType.INSTANCE;
+    }
+
+    @Nullable
+    @Override
+    public <O extends BlockEntity> BlockEntityTicker<O> getTicker(final Level level,
+                                                                  final BlockState blockState,
+                                                                  final BlockEntityType<O> type) {
+        return TICKER.get(level, type);
+    }
+
+    @Nullable
+    @Override
+    public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) {
+        return new DiskInterfaceBlockEntity(blockPos, blockState);
+    }
+
+    @Override
+    public BlockColorMap<DiskInterfaceBlock, BaseBlockItem> getBlockColorMap() {
+        return Blocks.INSTANCE.getDiskInterface();
+    }
+
+    @Override
+    public BaseBlockItem createBlockItem() {
+        return new NetworkNodeBlockItem(this, HELP);
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlockEntity.java
new file mode 100644
index 000000000..cccd5f663
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlockEntity.java
@@ -0,0 +1,220 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferListener;
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode;
+import com.refinedmods.refinedstorage2.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode;
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage;
+import com.refinedmods.refinedstorage2.platform.common.Platform;
+import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
+import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
+import com.refinedmods.refinedstorage2.platform.common.content.Items;
+import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings;
+import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer;
+import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.NonNullList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+
+// TODO models.
+// TODO: upgradeable + level interacting class hierarchy? Disk Interface is copying stuff now... :(
+public class DiskInterfaceBlockEntity extends AbstractDiskContainerBlockEntity<StorageTransferNetworkNode>
+    implements StorageTransferListener {
+    public static final int AMOUNT_OF_DISKS = 6;
+
+    private static final String TAG_UPGRADES = "u";
+    private static final String TAG_FILTER_MODE = "fim";
+    private static final String TAG_TRANSFER_MODE = "tm";
+
+    private final UpgradeContainer upgradeContainer;
+    private int workTickRate = 9;
+    private int workTicks;
+
+    public DiskInterfaceBlockEntity(final BlockPos pos, final BlockState state) {
+        super(BlockEntities.INSTANCE.getDiskInterface(), pos, state, new StorageTransferNetworkNode(
+            Platform.INSTANCE.getConfig().getDiskInterface().getEnergyUsage(),
+            Platform.INSTANCE.getConfig().getDiskInterface().getEnergyUsagePerDisk(),
+            AMOUNT_OF_DISKS
+        ));
+        this.upgradeContainer = new UpgradeContainer(
+            UpgradeDestinations.DISK_INTERFACE,
+            PlatformApi.INSTANCE.getUpgradeRegistry(),
+            this::upgradeContainerChanged
+        );
+        this.mainNode.setListener(this);
+        this.mainNode.setTransferQuotaProvider(storage -> {
+            if (storage instanceof SerializableStorage serializableStorage) {
+                return serializableStorage.getType().getDiskInterfaceTransferQuota(
+                    upgradeContainer.has(Items.INSTANCE.getStackUpgrade())
+                );
+            }
+            return 1;
+        });
+    }
+
+    private void upgradeContainerChanged() {
+        configureAccordingToUpgrades();
+        setChanged();
+    }
+
+    private void configureAccordingToUpgrades() {
+        final int amountOfSpeedUpgrades = upgradeContainer.getAmount(Items.INSTANCE.getSpeedUpgrade());
+        this.workTickRate = 9 - (amountOfSpeedUpgrades * 2);
+        final long baseEnergyUsage = Platform.INSTANCE.getConfig().getDiskInterface().getEnergyUsage();
+        mainNode.setEnergyUsage(baseEnergyUsage + upgradeContainer.getEnergyUsage());
+    }
+
+    @Override
+    public final void doWork() {
+        if (workTicks++ % workTickRate == 0) {
+            super.doWork();
+        }
+    }
+
+    @Override
+    protected void setFilters(final Set<ResourceKey> filters) {
+        mainNode.setFilters(filters);
+    }
+
+    @Override
+    protected void setNormalizer(final UnaryOperator<ResourceKey> normalizer) {
+        mainNode.setNormalizer(normalizer);
+    }
+
+    @Override
+    public void load(final CompoundTag tag) {
+        if (tag.contains(TAG_UPGRADES)) {
+            upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND));
+        }
+        configureAccordingToUpgrades();
+        super.load(tag);
+    }
+
+    @Override
+    public void saveAdditional(final CompoundTag tag) {
+        super.saveAdditional(tag);
+        tag.put(TAG_UPGRADES, upgradeContainer.createTag());
+        tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNode.getFilterMode()));
+    }
+
+    @Override
+    public void readConfiguration(final CompoundTag tag) {
+        super.readConfiguration(tag);
+        if (tag.contains(TAG_TRANSFER_MODE)) {
+            mainNode.setMode(TransferModeSettings.getTransferMode(tag.getInt(TAG_TRANSFER_MODE)));
+        }
+        if (tag.contains(TAG_FILTER_MODE)) {
+            mainNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE)));
+        }
+    }
+
+    @Override
+    public void writeConfiguration(final CompoundTag tag) {
+        super.writeConfiguration(tag);
+        tag.putInt(TAG_TRANSFER_MODE, TransferModeSettings.getTransferMode(mainNode.getMode()));
+    }
+
+    @Override
+    public List<Item> getUpgradeItems() {
+        final List<Item> upgradeItems = new ArrayList<>();
+        for (int i = 0; i < upgradeContainer.getContainerSize(); ++i) {
+            final ItemStack itemStack = upgradeContainer.getItem(i);
+            if (itemStack.isEmpty()) {
+                continue;
+            }
+            upgradeItems.add(itemStack.getItem());
+        }
+        return upgradeItems;
+    }
+
+    @Override
+    public boolean addUpgradeItem(final Item upgradeItem) {
+        return upgradeContainer.addItem(new ItemStack(upgradeItem)).isEmpty();
+    }
+
+    @Override
+    public Component getDisplayName() {
+        return ContentNames.DISK_INTERFACE;
+    }
+
+    @Override
+    public AbstractContainerMenu createMenu(final int syncId, final Inventory inv, final Player player) {
+        return new DiskInterfaceContainerMenu(
+            syncId,
+            player,
+            this,
+            diskInventory,
+            filter.getFilterContainer(),
+            upgradeContainer
+        );
+    }
+
+    @Override
+    public NonNullList<ItemStack> getDrops() {
+        final NonNullList<ItemStack> drops = super.getDrops();
+        for (int i = 0; i < upgradeContainer.getContainerSize(); ++i) {
+            drops.add(upgradeContainer.getItem(i));
+        }
+        return drops;
+    }
+
+    boolean isFuzzyMode() {
+        return filter.isFuzzyMode();
+    }
+
+    void setFuzzyMode(final boolean fuzzyMode) {
+        filter.setFuzzyMode(fuzzyMode);
+        setChanged();
+    }
+
+    FilterMode getFilterMode() {
+        return mainNode.getFilterMode();
+    }
+
+    void setFilterMode(final FilterMode mode) {
+        mainNode.setFilterMode(mode);
+        setChanged();
+    }
+
+    public StorageTransferMode getTransferMode() {
+        return mainNode.getMode();
+    }
+
+    public void setTransferMode(final StorageTransferMode mode) {
+        mainNode.setMode(mode);
+        setChanged();
+    }
+
+    @Override
+    public void onTransferSuccess(final int index) {
+        final ItemStack diskStack = diskInventory.getItem(index);
+        if (diskStack.isEmpty()) {
+            return;
+        }
+        for (int newIndex = AMOUNT_OF_DISKS / 2; newIndex < AMOUNT_OF_DISKS; ++newIndex) {
+            if (!diskInventory.getItem(newIndex).isEmpty()) {
+                continue;
+            }
+            diskInventory.setItem(index, ItemStack.EMPTY);
+            diskInventory.setItem(newIndex, diskStack);
+            return;
+        }
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java
new file mode 100644
index 000000000..67746631f
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java
@@ -0,0 +1,124 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode;
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer;
+import com.refinedmods.refinedstorage2.platform.common.content.Menus;
+import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
+import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot;
+import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl;
+import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer;
+import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations;
+import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.Slot;
+
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
+
+public class DiskInterfaceContainerMenu extends AbstractResourceContainerMenu {
+    private static final int DISK_SLOT_X1 = 44;
+    private static final int DISK_SLOT_X2 = 116;
+    private static final int DISK_SLOT_Y = 57;
+
+    private static final int FILTER_SLOT_X = 8;
+    private static final int FILTER_SLOT_Y = 20;
+
+    DiskInterfaceContainerMenu(final int syncId,
+                               final Player player,
+                               final DiskInterfaceBlockEntity blockEntity,
+                               final DiskInventory diskInventory,
+                               final ResourceContainer filterContainer,
+                               final UpgradeContainer upgradeContainer) {
+        super(Menus.INSTANCE.getDiskInterface(), syncId, player);
+        addSlots(player, diskInventory, filterContainer, upgradeContainer);
+        registerProperty(new ServerProperty<>(
+            PropertyTypes.REDSTONE_MODE,
+            blockEntity::getRedstoneMode,
+            blockEntity::setRedstoneMode
+        ));
+        registerProperty(new ServerProperty<>(
+            PropertyTypes.FUZZY_MODE,
+            blockEntity::isFuzzyMode,
+            blockEntity::setFuzzyMode
+        ));
+        registerProperty(new ServerProperty<>(
+            PropertyTypes.FILTER_MODE,
+            blockEntity::getFilterMode,
+            blockEntity::setFilterMode
+        ));
+        registerProperty(new ServerProperty<>(
+            DiskInterfacePropertyTypes.TRANSFER_MODE,
+            blockEntity::getTransferMode,
+            blockEntity::setTransferMode
+        ));
+    }
+
+    public DiskInterfaceContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) {
+        super(Menus.INSTANCE.getDiskInterface(), syncId);
+        addSlots(
+            playerInventory.player,
+            new FilteredContainer(DiskInterfaceBlockEntity.AMOUNT_OF_DISKS, StorageContainerItem.stackValidator()),
+            ResourceContainerImpl.createForFilter(),
+            new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, PlatformApi.INSTANCE.getUpgradeRegistry())
+        );
+        initializeResourceSlots(buf);
+        registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE));
+        registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false));
+        registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK));
+        registerProperty(new ClientProperty<>(
+            DiskInterfacePropertyTypes.TRANSFER_MODE,
+            StorageTransferMode.INSERT_INTO_NETWORK
+        ));
+    }
+
+    private void addSlots(final Player player,
+                          final FilteredContainer diskInventory,
+                          final ResourceContainer filterContainer,
+                          final UpgradeContainer upgradeContainer) {
+        for (int i = 0; i < diskInventory.getContainerSize(); ++i) {
+            addSlot(createDiskSlot(diskInventory, i));
+        }
+        for (int i = 0; i < filterContainer.size(); ++i) {
+            addSlot(createFilterSlot(filterContainer, i));
+        }
+        for (int i = 0; i < upgradeContainer.getContainerSize(); ++i) {
+            addSlot(new UpgradeSlot(upgradeContainer, i, 187, 6 + (i * 18)));
+        }
+        addPlayerInventory(player.getInventory(), 8, 129);
+
+        transferManager.addBiTransfer(player.getInventory(), upgradeContainer);
+        transferManager.addBiTransfer(player.getInventory(), diskInventory);
+        transferManager.addFilterTransfer(player.getInventory());
+    }
+
+    private Slot createFilterSlot(final ResourceContainer filterContainer, final int i) {
+        final int x = FILTER_SLOT_X + (18 * i);
+        return new ResourceSlot(
+            filterContainer,
+            i,
+            createTranslation("gui", "disk_interface.filter_help"),
+            x,
+            FILTER_SLOT_Y,
+            ResourceSlotType.FILTER
+        );
+    }
+
+    private Slot createDiskSlot(final FilteredContainer diskInventory, final int i) {
+        final int x = i < 3 ? DISK_SLOT_X1 : DISK_SLOT_X2;
+        final int y = DISK_SLOT_Y + ((i % 3) * 18);
+        return ValidatedSlot.forStorageContainer(diskInventory, i, x, y);
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java
new file mode 100644
index 000000000..471c88709
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java
@@ -0,0 +1,17 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType;
+
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier;
+
+class DiskInterfacePropertyTypes {
+    public static final PropertyType<StorageTransferMode> TRANSFER_MODE = new PropertyType<>(
+        createIdentifier("transfer_mode"),
+        TransferModeSettings::getTransferMode,
+        TransferModeSettings::getTransferMode
+    );
+
+    private DiskInterfacePropertyTypes() {
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java
new file mode 100644
index 000000000..9c1e0d7ad
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java
@@ -0,0 +1,66 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+import com.refinedmods.refinedstorage2.platform.common.storage.FilterModeSideButtonWidget;
+import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes;
+import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget;
+import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
+
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier;
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
+
+public class DiskInterfaceScreen extends AbstractBaseScreen<DiskInterfaceContainerMenu> {
+    private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_interface.png");
+
+    private static final MutableComponent IN_TEXT = createTranslation("gui", "disk_interface.in");
+    private static final MutableComponent OUT_TEXT = createTranslation("gui", "disk_interface.out");
+
+    public DiskInterfaceScreen(final DiskInterfaceContainerMenu menu,
+                               final Inventory playerInventory,
+                               final Component text) {
+        super(menu, playerInventory, text);
+        this.inventoryLabelY = 117;
+        this.imageWidth = 211;
+        this.imageHeight = 211;
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE)));
+        addSideButton(new TransferModeSideButtonWidget(
+            getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE)
+        ));
+        addSideButton(new FilterModeSideButtonWidget(
+            getMenu().getProperty(PropertyTypes.FILTER_MODE),
+            createTranslation("gui", "disk_interface.filter_mode.allow.help"),
+            createTranslation("gui", "disk_interface.filter_mode.block.help")
+        ));
+        addSideButton(new FuzzyModeSideButtonWidget(
+            getMenu().getProperty(PropertyTypes.FUZZY_MODE),
+            () -> getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE).getValue()
+                == StorageTransferMode.EXTRACT_FROM_NETWORK
+                ? FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK
+                : FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE
+        ));
+    }
+
+    @Override
+    protected void renderLabels(final GuiGraphics graphics, final int x, final int y) {
+        super.renderLabels(graphics, x, y);
+        graphics.drawString(font, IN_TEXT, 43, 45, 4210752, false);
+        graphics.drawString(font, OUT_TEXT, 115, 45, 4210752, false);
+    }
+
+    @Override
+    protected ResourceLocation getTexture() {
+        return TEXTURE;
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java
new file mode 100644
index 000000000..c142d7b1d
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java
@@ -0,0 +1,26 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+
+class TransferModeSettings {
+    private static final int INSERT_INTO_NETWORK = 0;
+    private static final int EXTRACT_FROM_NETWORK = 1;
+
+    private TransferModeSettings() {
+    }
+
+    static StorageTransferMode getTransferMode(final int transferMode) {
+        return switch (transferMode) {
+            case INSERT_INTO_NETWORK -> StorageTransferMode.INSERT_INTO_NETWORK;
+            case EXTRACT_FROM_NETWORK -> StorageTransferMode.EXTRACT_FROM_NETWORK;
+            default -> StorageTransferMode.INSERT_INTO_NETWORK;
+        };
+    }
+
+    static int getTransferMode(final StorageTransferMode transferMode) {
+        return switch (transferMode) {
+            case INSERT_INTO_NETWORK -> INSERT_INTO_NETWORK;
+            case EXTRACT_FROM_NETWORK -> EXTRACT_FROM_NETWORK;
+        };
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java
new file mode 100644
index 000000000..bc44cc2bb
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java
@@ -0,0 +1,74 @@
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode;
+import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty;
+import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget;
+
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
+
+class TransferModeSideButtonWidget extends AbstractSideButtonWidget {
+    private static final MutableComponent TITLE = createTranslation("gui", "disk_interface.transfer_mode");
+    private static final MutableComponent SUBTEXT_INSERT_INTO_NETWORK =
+        createTranslation("gui", "disk_interface.transfer_mode.insert_into_network");
+    private static final MutableComponent SUBTEXT_EXTRACT_FROM_NETWORK =
+        createTranslation("gui", "disk_interface.transfer_mode.extract_from_network");
+    private static final Component HELP_INSERT_INTO_NETWORK =
+        createTranslation("gui", "disk_interface.transfer_mode.insert_into_network.help");
+    private static final Component HELP_EXTRACT_FROM_NETWORK =
+        createTranslation("gui", "disk_interface.transfer_mode.extract_from_network.help");
+
+    private final ClientProperty<StorageTransferMode> property;
+
+    TransferModeSideButtonWidget(final ClientProperty<StorageTransferMode> property) {
+        super(createPressAction(property));
+        this.property = property;
+    }
+
+    private static OnPress createPressAction(final ClientProperty<StorageTransferMode> property) {
+        return btn -> property.setValue(toggle(property.getValue()));
+    }
+
+    private static StorageTransferMode toggle(final StorageTransferMode accessMode) {
+        return switch (accessMode) {
+            case INSERT_INTO_NETWORK -> StorageTransferMode.EXTRACT_FROM_NETWORK;
+            case EXTRACT_FROM_NETWORK -> StorageTransferMode.INSERT_INTO_NETWORK;
+        };
+    }
+
+    @Override
+    protected int getXTexture() {
+        return switch (property.getValue()) {
+            case INSERT_INTO_NETWORK -> 16;
+            case EXTRACT_FROM_NETWORK -> 0;
+        };
+    }
+
+    @Override
+    protected int getYTexture() {
+        return 160;
+    }
+
+    @Override
+    protected MutableComponent getTitle() {
+        return TITLE;
+    }
+
+    @Override
+    protected MutableComponent getSubText() {
+        return switch (property.getValue()) {
+            case INSERT_INTO_NETWORK -> SUBTEXT_INSERT_INTO_NETWORK;
+            case EXTRACT_FROM_NETWORK -> SUBTEXT_EXTRACT_FROM_NETWORK;
+        };
+    }
+
+    @Override
+    protected Component getHelpText() {
+        return switch (property.getValue()) {
+            case INSERT_INTO_NETWORK -> HELP_INSERT_INTO_NETWORK;
+            case EXTRACT_FROM_NETWORK -> HELP_EXTRACT_FROM_NETWORK;
+        };
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java
new file mode 100644
index 000000000..32a4bfd5a
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java
index db7fb2008..f7f0019d8 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java
@@ -41,8 +41,8 @@ public class ExternalStorageBlock extends AbstractDirectionalCableBlock
     private static final Map<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE = new HashMap<>();
     private static final AbstractBlockEntityTicker<ExternalStorageBlockEntity> TICKER =
         new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getExternalStorage);
-
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalStorageBlock.class);
+
     private final DyeColor color;
     private final MutableComponent name;
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java
index f29fcb6fd..af9c4f13d 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java
@@ -50,12 +50,12 @@ public ExternalStorageBlockEntity(final BlockPos pos, final BlockState state) {
         this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters(
             ResourceContainerImpl.createForFilter(),
             this::setChanged,
-            mainNode::setFilters
+            mainNode.getStorageConfiguration()::setFilters
         );
-        mainNode.setNormalizer(filter.createNormalizer());
+        mainNode.getStorageConfiguration().setNormalizer(filter.createNormalizer());
         mainNode.setTrackingRepository(trackedStorageRepository);
         this.configContainer = new StorageConfigurationContainerImpl(
-            mainNode,
+            mainNode.getStorageConfiguration(),
             filter,
             this::setChanged,
             this::getRedstoneMode,
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java
index 814003ce2..9229f1a42 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java
@@ -5,6 +5,7 @@
 import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem;
 import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory;
+import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyInfo;
@@ -12,14 +13,13 @@
 import javax.annotation.Nullable;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 
 public abstract class AbstractPortableGridContainerMenu extends AbstractGridContainerMenu
     implements EnergyContainerMenu {
-    private final SimpleContainer diskInventory;
+    private final FilteredContainer diskInventory;
     private final EnergyInfo energyInfo;
 
     @Nullable
@@ -32,7 +32,7 @@ public abstract class AbstractPortableGridContainerMenu extends AbstractGridCont
         final FriendlyByteBuf buf
     ) {
         super(menuType, syncId, playerInventory, buf);
-        this.diskInventory = new SimpleContainer(1);
+        this.diskInventory = new FilteredContainer(1, StorageContainerItem.stackValidator());
         this.energyInfo = EnergyInfo.forClient(playerInventory.player, buf.readLong(), buf.readLong());
     }
 
@@ -67,13 +67,7 @@ protected boolean canTransferSlot(final Slot slot) {
     @Override
     public void onScreenReady(final int playerInventoryY) {
         super.onScreenReady(playerInventoryY);
-        diskSlot = new ValidatedSlot(
-            diskInventory,
-            0,
-            -19,
-            8,
-            stack -> stack.getItem() instanceof StorageContainerItem
-        );
+        diskSlot = ValidatedSlot.forStorageContainer(diskInventory, 0, -19, 8);
         addSlot(diskSlot);
         transferManager.addBiTransfer(playerInventory, diskInventory);
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java
index c658ea8b5..3570421c0 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java
@@ -50,16 +50,16 @@ protected AbstractStorageBlockBlockEntity(final BlockEntityType<?> type,
         this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters(
             ResourceContainerImpl.createForFilter(resourceFactory),
             this::setChanged,
-            mainNode::setFilters
+            mainNode.getStorageConfiguration()::setFilters
         );
         this.configContainer = new StorageConfigurationContainerImpl(
-            mainNode,
+            mainNode.getStorageConfiguration(),
             filter,
             this::setChanged,
             this::getRedstoneMode,
             this::setRedstoneMode
         );
-        mainNode.setNormalizer(filter.createNormalizer());
+        mainNode.getStorageConfiguration().setNormalizer(filter.createNormalizer());
     }
 
     protected abstract Storage createStorage(Runnable listener);
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java
index 4b55dcce1..bc81c6f5e 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java
@@ -18,7 +18,6 @@ public StorageMonitorScreen(final StorageMonitorContainerMenu menu,
                                 final Inventory playerInventory,
                                 final Component text) {
         super(menu, playerInventory, text);
-
         this.inventoryLabelY = 43;
         this.imageWidth = 211;
         this.imageHeight = 137;
@@ -30,7 +29,7 @@ protected void init() {
         addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE)));
         addSideButton(new FuzzyModeSideButtonWidget(
             getMenu().getProperty(PropertyTypes.FUZZY_MODE),
-            FuzzyModeSideButtonWidget.Type.GENERIC
+            () -> FuzzyModeSideButtonWidget.Type.GENERIC
         ));
     }
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java
new file mode 100644
index 000000000..9650205f8
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java
@@ -0,0 +1,54 @@
+package com.refinedmods.refinedstorage2.platform.common.support;
+
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+
+public abstract class AbstractActiveColoredDirectionalBlock<T extends Enum<T> & StringRepresentable,
+    B extends Block & BlockItemProvider<I>, I extends BlockItem>
+    extends AbstractDirectionalBlock<T>
+    implements ColorableBlock<B, I> {
+    public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
+
+    private final DyeColor color;
+    private final MutableComponent name;
+
+    protected AbstractActiveColoredDirectionalBlock(final Properties properties,
+                                                    final DyeColor color,
+                                                    final MutableComponent name) {
+        super(properties);
+        this.color = color;
+        this.name = name;
+    }
+
+    @Override
+    protected BlockState getDefaultState() {
+        return super.getDefaultState().setValue(ACTIVE, false);
+    }
+
+    @Override
+    protected void createBlockStateDefinition(final StateDefinition.Builder<Block, BlockState> builder) {
+        super.createBlockStateDefinition(builder);
+        builder.add(ACTIVE);
+    }
+
+    @Override
+    public DyeColor getColor() {
+        return color;
+    }
+
+    @Override
+    public MutableComponent getName() {
+        return name;
+    }
+
+    @Override
+    public boolean canAlwaysConnect() {
+        return true;
+    }
+}
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleFilteredContainer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java
similarity index 73%
rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleFilteredContainer.java
rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java
index 13a83635f..bddb7bb35 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleFilteredContainer.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java
@@ -5,10 +5,10 @@
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.item.ItemStack;
 
-public final class SimpleFilteredContainer extends SimpleContainer {
+public class FilteredContainer extends SimpleContainer {
     private final Predicate<ItemStack> filter;
 
-    public SimpleFilteredContainer(final int size, final Predicate<ItemStack> filter) {
+    public FilteredContainer(final int size, final Predicate<ItemStack> filter) {
         super(size);
         this.filter = filter;
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java
index 0b4d78684..0b12a637f 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java
@@ -1,5 +1,7 @@
 package com.refinedmods.refinedstorage2.platform.common.support.containermenu;
 
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem;
+
 import java.util.function.Predicate;
 
 import net.minecraft.world.Container;
@@ -22,4 +24,11 @@ public ValidatedSlot(final Container container,
     public boolean mayPlace(final ItemStack stack) {
         return predicate.test(stack);
     }
+
+    public static Slot forStorageContainer(final Container container,
+                                           final int index,
+                                           final int x,
+                                           final int y) {
+        return new ValidatedSlot(container, index, x, y, stack -> stack.getItem() instanceof StorageContainerItem);
+    }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java
index 27f36f9ed..e98174976 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java
@@ -32,7 +32,7 @@ public abstract class AbstractUpgradeableNetworkNodeContainerBlockEntity<T exten
     private static final String TAG_UPGRADES = "u";
 
     protected final UpgradeContainer upgradeContainer;
-    private int workTickRate = 20;
+    private int workTickRate = 9;
     private int workTicks;
 
     protected AbstractUpgradeableNetworkNodeContainerBlockEntity(
@@ -105,7 +105,7 @@ public void load(final CompoundTag tag) {
     private void configureAccordingToUpgrades() {
         LOGGER.debug("Reconfiguring {} for upgrades", getBlockPos());
         final int amountOfSpeedUpgrades = upgradeContainer.getAmount(Items.INSTANCE.getSpeedUpgrade());
-        this.workTickRate = (amountOfSpeedUpgrades + 1) * 20;
+        this.workTickRate = 9 - (amountOfSpeedUpgrades * 2);
         this.setEnergyUsage(upgradeContainer.getEnergyUsage());
     }
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java
index 8c6846f57..c919fad87 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java
@@ -2,6 +2,8 @@
 
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty;
 
+import java.util.function.Supplier;
+
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 
@@ -13,14 +15,12 @@ public class FuzzyModeSideButtonWidget extends AbstractSideButtonWidget {
     private static final MutableComponent SUBTEXT_OFF = createTranslation("gui", "fuzzy_mode.off");
 
     private final ClientProperty<Boolean> property;
-    private final Component helpOn;
-    private final Component helpOff;
+    private final Supplier<Type> typeSupplier;
 
-    public FuzzyModeSideButtonWidget(final ClientProperty<Boolean> property, final Type type) {
+    public FuzzyModeSideButtonWidget(final ClientProperty<Boolean> property, final Supplier<Type> typeSupplier) {
         super(createPressAction(property));
         this.property = property;
-        this.helpOn = createTranslation("gui", "fuzzy_mode.on." + type.getHelpTranslationKey());
-        this.helpOff = createTranslation("gui", "fuzzy_mode.off." + type.getHelpTranslationKey());
+        this.typeSupplier = typeSupplier;
     }
 
     private static OnPress createPressAction(final ClientProperty<Boolean> property) {
@@ -49,7 +49,8 @@ protected MutableComponent getSubText() {
 
     @Override
     protected Component getHelpText() {
-        return Boolean.TRUE.equals(property.getValue()) ? helpOn : helpOff;
+        final Type type = typeSupplier.get();
+        return Boolean.TRUE.equals(property.getValue()) ? type.helpOnText : type.helpOffText;
     }
 
     public enum Type {
@@ -58,7 +59,15 @@ public enum Type {
         EXTRACTING_STORAGE_NETWORK,
         EXTRACTING_SOURCE;
 
-        String getHelpTranslationKey() {
+        private final MutableComponent helpOnText;
+        private final MutableComponent helpOffText;
+
+        Type() {
+            this.helpOnText = createTranslation("gui", "fuzzy_mode.on." + getHelpTranslationKey());
+            this.helpOffText = createTranslation("gui", "fuzzy_mode.off." + getHelpTranslationKey());
+        }
+
+        private String getHelpTranslationKey() {
             return name().toLowerCase() + "_help";
         }
     }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java
index 8111e68ee..442e9382e 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java
@@ -8,6 +8,8 @@
 
 import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation;
 
+
+// TODO: icons . 
 public class SchedulingModeSideButtonWidget extends AbstractSideButtonWidget {
     private static final MutableComponent TITLE = createTranslation("gui", "scheduling_mode");
 
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java
index 2897fc7a8..644af5af3 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java
@@ -16,7 +16,8 @@ public enum UpgradeDestinations implements UpgradeDestination {
     DESTRUCTOR(ContentNames.DESTRUCTOR, () -> new ItemStack(Items.INSTANCE.getDestructors().get(0).get())),
     CONSTRUCTOR(ContentNames.CONSTRUCTOR, () -> new ItemStack(Items.INSTANCE.getConstructors().get(0).get())),
     WIRELESS_TRANSMITTER(ContentNames.WIRELESS_TRANSMITTER,
-        () -> new ItemStack(Items.INSTANCE.getWirelessTransmitters().get(0).get()));
+        () -> new ItemStack(Items.INSTANCE.getWirelessTransmitters().get(0).get())),
+    DISK_INTERFACE(ContentNames.DISK_INTERFACE, () -> new ItemStack(Items.INSTANCE.getDiskInterfaces().get(0).get()));
 
     private final Component name;
     private final Supplier<ItemStack> stackFactory;
diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json
index b22979cea..79efad7d4 100644
--- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json
+++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json
@@ -34,7 +34,7 @@
   "block.refinedstorage2.security_manager": "Security Manager",
   "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.",
   "block.refinedstorage2.relay": "Relay",
-  "block.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay.",
+  "block.refinedstorage2.disk_interface": "Disk Interface",
   "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.",
   "gui.refinedstorage2.disk_drive.disks": "Disks",
   "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.",
@@ -153,9 +153,20 @@
   "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.",
   "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.",
   "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.",
+  "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.",
+  "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.",
+  "gui.refinedstorage2.disk_interface.in": "In",
+  "gui.refinedstorage2.disk_interface.out": "Out",
+  "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.",
+  "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode",
+  "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network",
+  "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.",
+  "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network",
+  "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.",
   "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.",
   "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.",
   "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.",
+  "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.",
   "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.",
   "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.",
   "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.",
@@ -165,6 +176,7 @@
   "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.",
   "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.",
   "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.",
+  "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.",
   "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron",
   "item.refinedstorage2.processor_binding": "Processor Binding",
   "item.refinedstorage2.silicon": "Silicon",
@@ -300,6 +312,7 @@
   "tag.item.refinedstorage2.security_managers": "Security Managers",
   "tag.item.refinedstorage2.storage_disks": "Storage Disks",
   "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters",
+  "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces",
   "text.autoconfig.refinedstorage2.title": "Refined Storage 2",
   "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling",
   "text.autoconfig.refinedstorage2.option.screenSize": "Screen size",
@@ -325,6 +338,9 @@
   "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive",
   "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage",
   "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk",
+  "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface",
+  "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage",
+  "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk",
   "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block",
   "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage",
   "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage",
@@ -395,6 +411,8 @@
   "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other",
   "advancements.refinedstorage2.drives": "Drives",
   "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks",
+  "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks",
+  "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks",
   "advancements.refinedstorage2.storing_items": "Storing items",
   "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive",
   "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage",
diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_interface.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_interface.png
new file mode 100644
index 000000000..4e813bc8d
Binary files /dev/null and b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_interface.png differ
diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json
new file mode 100644
index 000000000..abf6a881f
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json
@@ -0,0 +1,26 @@
+{
+  "display": {
+    "icon": {
+      "item": "refinedstorage2:disk_interface"
+    },
+    "title": {
+      "translate": "advancements.refinedstorage2.interfacing_with_disks"
+    },
+    "description": {
+      "translate": "advancements.refinedstorage2.interfacing_with_disks.description"
+    }
+  },
+  "parent": "refinedstorage2:drives",
+  "criteria": {
+    "disk_interface_in_inventory": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "refinedstorage2:disk_interfaces"
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json
new file mode 100644
index 000000000..4dd84737c
--- /dev/null
+++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json
@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "ESE",
+    "CMD",
+    "ESE"
+  ],
+  "key": {
+    "E": {
+      "item": "refinedstorage2:quartz_enriched_iron"
+    },
+    "S": {
+      "item": "refinedstorage2:storage_housing"
+    },
+    "C": {
+      "item": "refinedstorage2:construction_core"
+    },
+    "M": {
+      "item": "refinedstorage2:machine_casing"
+    },
+    "D": {
+      "item": "refinedstorage2:destruction_core"
+    }
+  },
+  "result": {
+    "item": "refinedstorage2:disk_interface"
+  }
+}
\ No newline at end of file
diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java
index 8f788287e..d08e39e19 100644
--- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java
+++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java
@@ -36,6 +36,9 @@ public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage2.p
     @ConfigEntry.Gui.CollapsibleObject
     private DiskDriveEntryImpl diskDrive = new DiskDriveEntryImpl();
 
+    @ConfigEntry.Gui.CollapsibleObject
+    private DiskInterfaceEntryImpl diskInterface = new DiskInterfaceEntryImpl();
+
     @ConfigEntry.Gui.CollapsibleObject
     private SimpleEnergyUsageEntryImpl cable = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.CABLE);
 
@@ -156,6 +159,11 @@ public DiskDriveEntry getDiskDrive() {
         return diskDrive;
     }
 
+    @Override
+    public DiskInterfaceEntry getDiskInterface() {
+        return diskInterface;
+    }
+
     @Override
     public SimpleEnergyUsageEntry getCable() {
         return cable;
@@ -417,6 +425,22 @@ public long getEnergyUsagePerDisk() {
         }
     }
 
+    private static class DiskInterfaceEntryImpl implements DiskInterfaceEntry {
+        private long energyUsage = DefaultEnergyUsage.DISK_INTERFACE;
+
+        private long energyUsagePerDisk = DefaultEnergyUsage.DISK_INTERFACE_PER_DISK;
+
+        @Override
+        public long getEnergyUsage() {
+            return energyUsage;
+        }
+
+        @Override
+        public long getEnergyUsagePerDisk() {
+            return energyUsagePerDisk;
+        }
+    }
+
     private static class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry {
         private long energyUsage;
 
diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java
index 257d37da7..7214b9514 100644
--- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java
+++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java
@@ -19,6 +19,7 @@
 import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardItem;
 import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItem;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock;
@@ -56,6 +57,7 @@
 import com.refinedmods.refinedstorage2.platform.fabric.support.resource.ResourceContainerFluidStorageAdapter;
 import com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -74,6 +76,10 @@
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
 import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage;
 import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.FilteringStorage;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -388,6 +394,15 @@ private void registerSidedHandlers() {
             InterfaceBlockEntity::getExportedResourcesAsContainer,
             BlockEntities.INSTANCE.getInterface()
         );
+        ItemStorage.SIDED.registerForBlockEntity((blockEntity, context) -> {
+            final InventoryStorage storage = InventoryStorage.of(blockEntity.getDiskInventory(), context);
+            final List<Storage<ItemVariant>> parts = new ArrayList<>();
+            for (int i = 0; i < DiskInterfaceBlockEntity.AMOUNT_OF_DISKS; ++i) {
+                final var slot = storage.getSlot(i);
+                parts.add(i < 3 ? FilteringStorage.insertOnlyOf(slot) : FilteringStorage.extractOnlyOf(slot));
+            }
+            return new CombinedStorage<>(parts);
+        }, BlockEntities.INSTANCE.getDiskInterface());
         FluidStorage.SIDED.registerForBlockEntity(
             (blockEntity, context) -> new ResourceContainerFluidStorageAdapter(blockEntity.getExportedResources()),
             BlockEntities.INSTANCE.getInterface()
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java
index 2406e4068..f9a3477ed 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java
@@ -25,6 +25,7 @@ public class ConfigImpl implements Config {
     private final SimpleEnergyUsageEntry cable;
     private final ControllerEntry controller;
     private final DiskDriveEntry diskDrive;
+    private final DiskInterfaceEntry diskInterface;
     private final GridEntry grid;
     private final CraftingGridEntry craftingGrid;
     private final StorageBlockEntry storageBlock;
@@ -61,6 +62,7 @@ public ConfigImpl() {
         cable = new SimpleEnergyUsageEntryImpl("cable", "Cable", DefaultEnergyUsage.CABLE);
         controller = new ControllerEntryImpl();
         diskDrive = new DiskDriveEntryImpl();
+        diskInterface = new DiskInterfaceEntryImpl();
         grid = new GridEntryImpl();
         craftingGrid = new CraftingGridEntryImpl();
         storageBlock = new StorageBlockEntryImpl();
@@ -158,6 +160,11 @@ public DiskDriveEntry getDiskDrive() {
         return diskDrive;
     }
 
+    @Override
+    public DiskInterfaceEntry getDiskInterface() {
+        return diskInterface;
+    }
+
     @Override
     public SimpleEnergyUsageEntry getCable() {
         return cable;
@@ -320,6 +327,30 @@ public long getEnergyUsagePerDisk() {
         }
     }
 
+    private class DiskInterfaceEntryImpl implements DiskInterfaceEntry {
+        private final ModConfigSpec.LongValue energyUsage;
+        private final ModConfigSpec.LongValue energyUsagePerDisk;
+
+        private DiskInterfaceEntryImpl() {
+            builder.push("diskInterface");
+            energyUsage = builder.comment("The energy used by the Disk Interface")
+                .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_INTERFACE, 0, Long.MAX_VALUE);
+            energyUsagePerDisk = builder.comment("The energy used per disk")
+                .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_INTERFACE_PER_DISK, 0, Long.MAX_VALUE);
+            builder.pop();
+        }
+
+        @Override
+        public long getEnergyUsage() {
+            return energyUsage.get();
+        }
+
+        @Override
+        public long getEnergyUsagePerDisk() {
+            return energyUsagePerDisk.get();
+        }
+    }
+
     private class GridEntryImpl implements GridEntry {
         private final ModConfigSpec.BooleanValue largeFont;
         private final ModConfigSpec.BooleanValue preventSortingWhileShiftIsDown;
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java
index 9025bb209..dda6112ce 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java
@@ -17,6 +17,7 @@
 import com.refinedmods.refinedstorage2.platform.common.iface.InterfacePlatformExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardItem;
 import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItem;
+import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock;
@@ -37,6 +38,7 @@
 import com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.ForgePortableGridBlockEntity;
 import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter;
+import com.refinedmods.refinedstorage2.platform.forge.support.inventory.InsertExtractItemHandler;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridClearPacket;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridRecipeTransferPacket;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.GridExtractPacket;
@@ -97,6 +99,7 @@
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.neoforged.neoforge.event.level.BlockEvent;
 import net.neoforged.neoforge.items.wrapper.InvWrapper;
+import net.neoforged.neoforge.items.wrapper.RangedWrapper;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
 import net.neoforged.neoforge.network.registration.IPayloadRegistrar;
 import net.neoforged.neoforge.registries.DeferredRegister;
@@ -198,7 +201,8 @@ private void registerExternalStorageProviderFactories() {
         PlatformApi.INSTANCE.addExternalStorageProviderFactory(new InterfacePlatformExternalStorageProviderFactory());
         PlatformApi.INSTANCE.addExternalStorageProviderFactory(new ItemHandlerPlatformExternalStorageProviderFactory());
         PlatformApi.INSTANCE.addExternalStorageProviderFactory(
-            new FluidHandlerPlatformExternalStorageProviderFactory());
+            new FluidHandlerPlatformExternalStorageProviderFactory()
+        );
     }
 
     private void registerContent(final IEventBus eventBus) {
@@ -365,6 +369,25 @@ private void registerCapabilities(final RegisterCapabilitiesEvent event) {
             (stack, ctx) -> new EnergyStorageAdapter(PortableGridBlockItem.createEnergyStorage(stack)),
             Items.INSTANCE.getPortableGrid()
         );
+        event.registerBlockEntity(
+            Capabilities.ItemHandler.BLOCK,
+            BlockEntities.INSTANCE.getDiskInterface(),
+            (be, side) -> {
+                final InvWrapper wrapper = new InvWrapper(be.getDiskInventory());
+                return new InsertExtractItemHandler(
+                    new RangedWrapper(
+                        wrapper,
+                        0,
+                        DiskInterfaceBlockEntity.AMOUNT_OF_DISKS / 2
+                    ),
+                    new RangedWrapper(
+                        wrapper,
+                        DiskInterfaceBlockEntity.AMOUNT_OF_DISKS / 2,
+                        DiskInterfaceBlockEntity.AMOUNT_OF_DISKS
+                    )
+                );
+            }
+        );
     }
 
     private void registerSounds(final IEventBus eventBus) {
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java
index 668da5c78..659226ffb 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java
@@ -10,7 +10,7 @@
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlock;
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlock;
 import com.refinedmods.refinedstorage2.platform.common.networking.RelayBlock;
-import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlock;
+import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType;
@@ -315,7 +315,7 @@ private void registerSecurityManagers() {
             final var builder = getVariantBuilder(block.get());
             builder.forAllStates(blockState -> {
                 final ConfiguredModel.Builder<?> model = ConfiguredModel.builder();
-                if (Boolean.TRUE.equals(blockState.getValue(SecurityManagerBlock.ACTIVE))) {
+                if (Boolean.TRUE.equals(blockState.getValue(AbstractActiveColoredDirectionalBlock.ACTIVE))) {
                     model.modelFile(active);
                 } else {
                     model.modelFile(inactive);
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java
index 9ce374516..a4f33facc 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java
@@ -40,33 +40,28 @@ public static void onGatherData(final GatherDataEvent dataEvent) {
     private static void registerBlockStateProviders(final DataGenerator generator,
                                                     final ExistingFileHelper existingFileHelper) {
         final PackGenerator mainPack = generator.getVanillaPack(true);
-
         mainPack.addProvider(output -> new BlockStateProviderImpl(output, existingFileHelper));
     }
 
     private static void registerBlockModelProviders(final DataGenerator generator,
                                                     final ExistingFileHelper existingFileHelper) {
         final PackGenerator mainPack = generator.getVanillaPack(true);
-
         mainPack.addProvider(output -> new BlockModelProviderImpl(output, existingFileHelper));
     }
 
     private static void registerItemModelProviders(final DataGenerator generator,
                                                    final ExistingFileHelper existingFileHelper) {
         final PackGenerator mainPack = generator.getVanillaPack(true);
-
         mainPack.addProvider(output -> new ItemModelProviderImpl(output, existingFileHelper));
     }
 
     private static void registerLootTableProviders(final DataGenerator generator) {
         final PackGenerator mainPack = generator.getVanillaPack(true);
-
         mainPack.addProvider(LootTableProviderImpl::new);
     }
 
     private static void registerRecipeProviders(final DataGenerator generator) {
         final PackGenerator mainPack = generator.getVanillaPack(true);
-
         mainPack.addProvider(RecoloringRecipeProvider::new);
     }
 
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java
index f0d9df1ba..68ccaf7cf 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java
@@ -34,6 +34,7 @@ protected void generate() {
         Blocks.INSTANCE.getNetworkTransmitter().forEach((color, id, block) -> dropSelf(block.get()));
         Blocks.INSTANCE.getSecurityManager().forEach((color, id, block) -> dropSelf(block.get()));
         Blocks.INSTANCE.getRelay().forEach((color, id, block) -> dropSelf(block.get()));
+        Blocks.INSTANCE.getDiskInterface().forEach((color, id, block) -> dropSelf(block.get()));
     }
 
     @Override
@@ -52,6 +53,7 @@ protected Iterable<Block> getKnownBlocks() {
         blocks.addAll(Blocks.INSTANCE.getNetworkTransmitter().values());
         blocks.addAll(Blocks.INSTANCE.getSecurityManager().values());
         blocks.addAll(Blocks.INSTANCE.getRelay().values());
+        blocks.addAll(Blocks.INSTANCE.getDiskInterface().values());
         return blocks;
     }
 }
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java
index 55386a36a..5049b81da 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java
@@ -68,6 +68,9 @@ protected void buildRecipes(final RecipeOutput output) {
         Blocks.INSTANCE.getRelay().forEach((color, id, block) ->
             recipe(Tags.RELAYS, block.get().asItem(), color)
                 .save(output, recipeId(color, "relay")));
+        Blocks.INSTANCE.getDiskInterface().forEach((color, id, block) ->
+            recipe(Tags.DISK_INTERFACES, block.get().asItem(), color)
+                .save(output, recipeId(color, "disk_interface")));
     }
 
     private ResourceLocation recipeId(final DyeColor color, final String suffix) {
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java
index 5aee00d63..254ce5918 100644
--- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java
@@ -27,6 +27,7 @@
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CREATIVE_CONTROLLERS;
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DESTRUCTORS;
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DETECTORS;
+import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DISK_INTERFACES;
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.EXPORTERS;
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.EXTERNAL_STORAGES;
 import static com.refinedmods.refinedstorage2.platform.common.content.Tags.FLUID_STORAGE_DISKS;
@@ -120,6 +121,10 @@ protected void addTags(final HolderLookup.Provider provider) {
             Blocks.INSTANCE.getRelay().values().stream()
                 .map(block -> (Supplier<Item>) block::asItem)
                 .toList());
+        addAllToTag(DISK_INTERFACES,
+            Blocks.INSTANCE.getDiskInterface().values().stream()
+                .map(block -> (Supplier<Item>) block::asItem)
+                .toList());
     }
 
     private <T extends Item> void addAllToTag(final TagKey<Item> t, final Collection<Supplier<T>> items) {
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java
new file mode 100644
index 000000000..199bc41d5
--- /dev/null
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java
@@ -0,0 +1,52 @@
+package com.refinedmods.refinedstorage2.platform.forge.support.inventory;
+
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.items.IItemHandler;
+
+public class InsertExtractItemHandler implements IItemHandler {
+    private final IItemHandler insertHandler;
+    private final IItemHandler extractHandler;
+
+    public InsertExtractItemHandler(final IItemHandler insertHandler, final IItemHandler extractHandler) {
+        this.insertHandler = insertHandler;
+        this.extractHandler = extractHandler;
+    }
+
+    @Override
+    public int getSlots() {
+        return insertHandler.getSlots() + extractHandler.getSlots();
+    }
+
+    @Override
+    public ItemStack getStackInSlot(final int slot) {
+        return slot < insertHandler.getSlots()
+            ? insertHandler.getStackInSlot(slot)
+            : extractHandler.getStackInSlot(slot - insertHandler.getSlots());
+    }
+
+    @Override
+    public ItemStack insertItem(final int slot, final ItemStack stack, final boolean simulate) {
+        return slot < insertHandler.getSlots() ? insertHandler.insertItem(slot, stack, simulate) : stack;
+    }
+
+    @Override
+    public ItemStack extractItem(final int slot, final int amount, final boolean simulate) {
+        return slot >= insertHandler.getSlots()
+            ? extractHandler.extractItem(slot - insertHandler.getSlots(), amount, simulate)
+            : ItemStack.EMPTY;
+    }
+
+    @Override
+    public int getSlotLimit(final int slot) {
+        return slot < insertHandler.getSlots()
+            ? insertHandler.getSlotLimit(slot)
+            : extractHandler.getSlotLimit(slot - insertHandler.getSlots());
+    }
+
+    @Override
+    public boolean isItemValid(final int slot, final ItemStack stack) {
+        return slot < insertHandler.getSlots()
+            ? insertHandler.isItemValid(slot, stack)
+            : extractHandler.isItemValid(slot - extractHandler.getSlots(), stack);
+    }
+}
diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java
new file mode 100644
index 000000000..b8c2ddf96
--- /dev/null
+++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.forge.support.inventory;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java
index 8874c9703..ecd274f71 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java
@@ -18,5 +18,13 @@ public enum AccessMode {
     /**
      * Extract-only.
      */
-    EXTRACT
+    EXTRACT;
+
+    public boolean isInsertOnly() {
+        return this == INSERT;
+    }
+
+    public boolean isExtractOnly() {
+        return this == EXTRACT;
+    }
 }
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java
index 70da6d0ce..8b55c0f26 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java
@@ -26,6 +26,10 @@ public StateTrackedStorage(final Storage delegate, @Nullable final Listener list
         this.state = computeState();
     }
 
+    public Storage getDelegate() {
+        return delegate;
+    }
+
     public StorageState getState() {
         return state;
     }
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java
index 63cf41f57..ae9749c6b 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java
@@ -13,7 +13,7 @@
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0")
 public interface CompositeStorage extends Storage, TrackedStorage {
     /**
-     * Sorts storages that implement {@link Priority}.
+     * Sorts storages that implement {@link PriorityProvider}.
      */
     void sortSources();
 
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java
index c5c3bb988..35edd04de 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java
@@ -8,8 +8,8 @@ class PrioritizedStorageComparator implements Comparator<Storage> {
     static final Comparator<Storage> INSTANCE = new PrioritizedStorageComparator();
 
     private static int getPriority(final Storage storage) {
-        if (storage instanceof Priority priority) {
-            return priority.getPriority();
+        if (storage instanceof PriorityProvider priorityProvider) {
+            return priorityProvider.getPriority();
         }
         return 0;
     }
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/Priority.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java
similarity index 93%
rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/Priority.java
rename to refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java
index 47299e911..6514597f3 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/Priority.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java
@@ -7,7 +7,7 @@
  * are contained in an {@link CompositeStorage}.
  */
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0")
-public interface Priority {
+public interface PriorityProvider {
     /**
      * The priority. Higher priority storages will be inserted into and extracted from first.
      *
diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java
index 034996742..a31231b91 100644
--- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java
+++ b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java
@@ -6,7 +6,7 @@
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6")
-public class PriorityStorage extends AbstractProxyStorage implements Priority {
+public class PriorityStorage extends AbstractProxyStorage implements PriorityProvider {
     private int priority;
 
     private PriorityStorage(final int priority, final Storage delegate) {