diff --git a/gradle.properties b/gradle.properties
index 68dc09ac..edb1ce1a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=19
+aebuild=20
 aegroup=appeng
 aebasename=appliedenergistics2
 
diff --git a/src/api/java/appeng/api/definitions/IBlocks.java b/src/api/java/appeng/api/definitions/IBlocks.java
index a0c39692..8caad317 100644
--- a/src/api/java/appeng/api/definitions/IBlocks.java
+++ b/src/api/java/appeng/api/definitions/IBlocks.java
@@ -156,6 +156,11 @@ public interface IBlocks {
 
     ITileDefinition energyCellCreative();
 
+    /*
+     * legacy
+     */
+    ITileDefinition legacyController();
+
     // rv1
     ITileDefinition craftingUnit();
 
diff --git a/src/main/java/appeng/block/legacy/BlockTransitionPlane.java b/src/main/java/appeng/block/legacy/BlockTransitionPlane.java
index f70e4de2..0cc04896 100644
--- a/src/main/java/appeng/block/legacy/BlockTransitionPlane.java
+++ b/src/main/java/appeng/block/legacy/BlockTransitionPlane.java
@@ -26,7 +26,7 @@ public class BlockTransitionPlane extends AEBaseTileBlock {
         super(Material.iron);
         this.isOpaque = true;
         this.setTileEntity(TileTransitionPlane.class);
-        this.setFeature(EnumSet.of(AEFeature.Legacy));
+        this.setFeature(EnumSet.of(AEFeature.Legacy, AEFeature.Experimental));
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java
index 92c059fc..d96c3163 100644
--- a/src/main/java/appeng/block/networking/BlockController.java
+++ b/src/main/java/appeng/block/networking/BlockController.java
@@ -35,7 +35,7 @@ public class BlockController extends AEBaseTileBlock {
         super(Material.iron);
         this.setTileEntity(TileController.class);
         this.setHardness(6);
-        this.setFeature(EnumSet.of(AEFeature.Core));
+        this.setFeature(EnumSet.of(AEFeature.Controller));
     }
 
     @Override
diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java
index 51f31de9..6b1f4d86 100644
--- a/src/main/java/appeng/core/CreativeTab.java
+++ b/src/main/java/appeng/core/CreativeTab.java
@@ -50,6 +50,7 @@ public final class CreativeTab extends CreativeTabs {
 
         return this.findFirst(
             blocks.controller(),
+            blocks.legacyController(),
             blocks.chest(),
             blocks.cellWorkbench(),
             blocks.fluix(),
diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index b5cb6dc0..3721c8f6 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -685,4 +685,9 @@ public final class ApiBlocks implements IBlocks {
     public Set<IOrientableBlock> orientables() {
         return this.orientables;
     }
+
+    @Override
+    public ITileDefinition legacyController() {
+        return this.legacyController;
+    }
 }
diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java
index e880ec30..30c1fed5 100644
--- a/src/main/java/appeng/core/features/AEFeature.java
+++ b/src/main/java/appeng/core/features/AEFeature.java
@@ -66,6 +66,7 @@ public enum AEFeature {
     QuantumNetworkBridge(Constants.CATEGORY_NETWORK_FEATURES),
     Channels(Constants.CATEGORY_NETWORK_FEATURES),
     Legacy(Constants.CATEGORY_NETWORK_FEATURES),
+    Controller(Constants.CATEGORY_NETWORK_FEATURES),
 
     LevelEmitter(Constants.CATEGORY_NETWORK_BUSES),
     CraftingTerminal(Constants.CATEGORY_NETWORK_BUSES),
@@ -78,6 +79,10 @@ public enum AEFeature {
     ExportBus(Constants.CATEGORY_NETWORK_BUSES),
     StorageBus(Constants.CATEGORY_NETWORK_BUSES),
     PartConversionMonitor(Constants.CATEGORY_NETWORK_BUSES),
+    PartPatternTerminal(Constants.CATEGORY_NETWORK_BUSES),
+    PartTerminal(Constants.CATEGORY_NETWORK_BUSES),
+    PartMonitor(Constants.CATEGORY_NETWORK_BUSES),
+    QuartzFiber(Constants.CATEGORY_NETWORK_BUSES),
 
     PortableCell(Constants.CATEGORY_PORTABLE_CELL),
 
@@ -119,6 +124,7 @@ public enum AEFeature {
     CraftingLog(Constants.CATEGORY_MISC, false),
     LightDetector(Constants.CATEGORY_MISC),
     DebugLogging(Constants.CATEGORY_MISC, false),
+    Experimental(Constants.CATEGORY_MISC, false),
 
     EnableFacadeCrafting(Constants.CATEGORY_CRAFTING),
     InWorldSingularity(Constants.CATEGORY_CRAFTING),
diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java
index 1854a4e2..5247575c 100644
--- a/src/main/java/appeng/items/parts/PartType.java
+++ b/src/main/java/appeng/items/parts/PartType.java
@@ -109,28 +109,28 @@ public enum PartType {
 
     QuartzFiber(
         140,
-        EnumSet.of(AEFeature.Core),
+        EnumSet.of(AEFeature.QuartzFiber),
         EnumSet.noneOf(IntegrationType.class),
         PartQuartzFiber.class
     ),
 
     Monitor(
         160,
-        EnumSet.of(AEFeature.Core),
+        EnumSet.of(AEFeature.PartMonitor),
         EnumSet.noneOf(IntegrationType.class),
         PartPanel.class
     ),
 
     SemiDarkMonitor(
         180,
-        EnumSet.of(AEFeature.Core),
+        EnumSet.of(AEFeature.PartMonitor),
         EnumSet.noneOf(IntegrationType.class),
         PartSemiDarkPanel.class
     ),
 
     DarkMonitor(
         200,
-        EnumSet.of(AEFeature.Core),
+        EnumSet.of(AEFeature.PartMonitor),
         EnumSet.noneOf(IntegrationType.class),
         PartDarkPanel.class
     ),
@@ -186,7 +186,7 @@ public enum PartType {
 
     PatternTerminal(
         340,
-        EnumSet.of(AEFeature.Patterns),
+        EnumSet.of(AEFeature.Patterns, AEFeature.PartPatternTerminal),
         EnumSet.noneOf(IntegrationType.class),
         PartPatternTerminal.class
     ),
@@ -200,7 +200,7 @@ public enum PartType {
 
     Terminal(
         380,
-        EnumSet.of(AEFeature.Core),
+        EnumSet.of(AEFeature.PartTerminal),
         EnumSet.noneOf(IntegrationType.class),
         PartTerminal.class
     ),